mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10626] CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY -> CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY

Browse source
This commit is contained in:
XTZGZoReX 2011-01-16 18:47:46 +01:00
parent 784c0ca781
commit 2d87d68b4e
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Creature.cpp
View file

@ -1414,7 +1414,7 @@ void Creature::SetDeathState(DeathState s)
m_respawnTime = time(NULL) + m_respawnDelay; // respawn delay (spawntimesecs) m_respawnTime = time(NULL) + m_respawnDelay; // respawn delay (spawntimesecs)
// always save boss respawn time at death to prevent crash cheating // always save boss respawn time at death to prevent crash cheating
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY) || IsWorldBoss()) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY) || IsWorldBoss())
SaveRespawnTime(); SaveRespawnTime();
} }

2
src/game/GameObject.cpp
View file

@ -420,7 +420,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
m_respawnTime = m_spawnedByDefault ? time(NULL) + m_respawnDelayTime : 0; m_respawnTime = m_spawnedByDefault ? time(NULL) + m_respawnDelayTime : 0;
// if option not set then object will be saved at grid unload // if option not set then object will be saved at grid unload
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY)) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
SaveRespawnTime(); SaveRespawnTime();
// if part of pool, let pool system schedule new spawn instead of just scheduling respawn // if part of pool, let pool system schedule new spawn instead of just scheduling respawn

2
src/game/Map.cpp
View file

@ -650,7 +650,7 @@ Map::Remove(T *obj, bool remove)
if( remove ) if( remove )
{ {
// if option set then object already saved at this moment // if option set then object already saved at this moment
if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY)) if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
obj->SaveRespawnTime(); obj->SaveRespawnTime();
// Note: In case resurrectable corpse and pet its removed from global lists in own destructor // Note: In case resurrectable corpse and pet its removed from global lists in own destructor

2
src/game/ObjectGridLoader.cpp
View file

@ -273,7 +273,7 @@ ObjectGridUnloader::Visit(GridRefManager<T> &m)
{ {
T *obj = m.getFirst()->getSource(); T *obj = m.getFirst()->getSource();
// if option set then object already saved at this moment // if option set then object already saved at this moment
if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY)) if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
obj->SaveRespawnTime(); obj->SaveRespawnTime();
///- object must be out of world before delete ///- object must be out of world before delete
obj->RemoveFromWorld(); obj->RemoveFromWorld();

4
src/game/PoolManager.cpp
View file

@ -391,7 +391,7 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj, bool instantly)
if(!instantly) if(!instantly)
{ {
pCreature->SetRespawnTime( pCreature->GetRespawnDelay() ); pCreature->SetRespawnTime( pCreature->GetRespawnDelay() );
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY) || pCreature->IsWorldBoss()) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY) || pCreature->IsWorldBoss())
pCreature->SaveRespawnTime(); pCreature->SaveRespawnTime();
} }
map->Add(pCreature); map->Add(pCreature);
@ -440,7 +440,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj, bool instantly)
if(!instantly) if(!instantly)
{ {
pGameobject->SetRespawnTime( pGameobject->GetRespawnDelay() ); pGameobject->SetRespawnTime( pGameobject->GetRespawnDelay() );
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY)) if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
pGameobject->SaveRespawnTime(); pGameobject->SaveRespawnTime();
} }
map->Add(pGameobject); map->Add(pGameobject);

2
src/game/World.cpp
View file

@ -655,7 +655,7 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_UINT32_MAX_OVERSPEED_PINGS, 2); setConfig(CONFIG_UINT32_MAX_OVERSPEED_PINGS, 2);
} }
setConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY, "SaveRespawnTimeImmediately", true); setConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY, "SaveRespawnTimeImmediately", true);
setConfig(CONFIG_BOOL_WEATHER, "ActivateWeather", true); setConfig(CONFIG_BOOL_WEATHER, "ActivateWeather", true);
setConfig(CONFIG_BOOL_ALWAYS_MAX_SKILL_FOR_LEVEL, "AlwaysMaxSkillForLevel", false); setConfig(CONFIG_BOOL_ALWAYS_MAX_SKILL_FOR_LEVEL, "AlwaysMaxSkillForLevel", false);

2
src/game/World.h
View file

@ -278,7 +278,7 @@ enum eConfigFloatValues
enum eConfigBoolValues enum eConfigBoolValues
{ {
CONFIG_BOOL_GRID_UNLOAD = 0, CONFIG_BOOL_GRID_UNLOAD = 0,
CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY, CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY,
CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET, CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET,
CONFIG_BOOL_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_BOOL_ALLOW_TWO_SIDE_ACCOUNTS,
CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT,

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11017" #define REVISION_NR "10626"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__