diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 52f78e979..a7d62a960 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1414,7 +1414,7 @@ void Creature::SetDeathState(DeathState s) m_respawnTime = time(NULL) + m_respawnDelay; // respawn delay (spawntimesecs) // 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(); } diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 30c605778..019686fab 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -420,7 +420,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/) m_respawnTime = m_spawnedByDefault ? time(NULL) + m_respawnDelayTime : 0; // 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(); // if part of pool, let pool system schedule new spawn instead of just scheduling respawn diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 4a5b50a1b..bbd654381 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -650,7 +650,7 @@ Map::Remove(T *obj, bool remove) if( remove ) { // 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(); // Note: In case resurrectable corpse and pet its removed from global lists in own destructor diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 1ab768a45..a9de5d014 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -273,7 +273,7 @@ ObjectGridUnloader::Visit(GridRefManager &m) { T *obj = m.getFirst()->getSource(); // 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(); ///- object must be out of world before delete obj->RemoveFromWorld(); diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp index d40c5f59e..426047c48 100644 --- a/src/game/PoolManager.cpp +++ b/src/game/PoolManager.cpp @@ -391,7 +391,7 @@ void PoolGroup::Spawn1Object(PoolObject* obj, bool instantly) if(!instantly) { 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(); } map->Add(pCreature); @@ -440,7 +440,7 @@ void PoolGroup::Spawn1Object(PoolObject* obj, bool instantly) if(!instantly) { pGameobject->SetRespawnTime( pGameobject->GetRespawnDelay() ); - if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY)) + if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY)) pGameobject->SaveRespawnTime(); } map->Add(pGameobject); diff --git a/src/game/World.cpp b/src/game/World.cpp index 3441c70ff..32e9f564b 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -655,7 +655,7 @@ void World::LoadConfigSettings(bool reload) 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_ALWAYS_MAX_SKILL_FOR_LEVEL, "AlwaysMaxSkillForLevel", false); diff --git a/src/game/World.h b/src/game/World.h index cdf23de49..a57e5bb39 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -278,7 +278,7 @@ enum eConfigFloatValues enum eConfigBoolValues { 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_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT, diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index fedce96d4..6fb5a5d09 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11017" + #define REVISION_NR "10626" #endif // __REVISION_NR_H__