From 108feb993dd402cbeb7355e296961fba2757b195 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 10 Feb 2011 05:30:15 +0300 Subject: [PATCH] [11127] Rename src/game/InstanceSaveMgr.* -> src/game/MapPersistentStateMgr.* --- src/game/CalendarHandler.cpp | 2 +- src/game/Creature.cpp | 2 +- src/game/GameObject.cpp | 2 +- src/game/Group.cpp | 2 +- src/game/Level1.cpp | 2 +- src/game/Level3.cpp | 2 +- src/game/Map.cpp | 2 +- src/game/MapManager.cpp | 2 +- ...anceSaveMgr.cpp => MapPersistentStateMgr.cpp} | 2 +- ...InstanceSaveMgr.h => MapPersistentStateMgr.h} | 0 src/game/MovementHandler.cpp | 2 +- src/game/ObjectMgr.cpp | 2 +- src/game/Player.cpp | 2 +- src/game/PoolManager.cpp | 2 +- src/game/Unit.cpp | 2 +- src/game/World.cpp | 2 +- src/shared/revision_nr.h | 2 +- win/VC100/game.vcxproj | 4 ++-- win/VC100/game.vcxproj.filters | 12 ++++++------ win/VC80/game.vcproj | 16 ++++++++-------- win/VC90/game.vcproj | 16 ++++++++-------- 21 files changed, 40 insertions(+), 40 deletions(-) rename src/game/{InstanceSaveMgr.cpp => MapPersistentStateMgr.cpp} (99%) rename src/game/{InstanceSaveMgr.h => MapPersistentStateMgr.h} (100%) diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index 4742d8065..c58613f84 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -22,7 +22,7 @@ #include "WorldPacket.h" #include "WorldSession.h" #include "Opcodes.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" void WorldSession::HandleCalendarGetCalendar(WorldPacket &/*recv_data*/) { diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 9414ee88d..217e6d7ec 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -38,7 +38,7 @@ #include "Formulas.h" #include "WaypointMovementGenerator.h" #include "InstanceData.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "BattleGroundMgr.h" #include "Spell.h" #include "Util.h" diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index f13165639..a5a23f215 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -32,7 +32,7 @@ #include "GridNotifiersImpl.h" #include "CellImpl.h" #include "InstanceData.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "BattleGround.h" #include "BattleGroundAV.h" #include "Util.h" diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 09ad334f8..67b50c2ef 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -29,7 +29,7 @@ #include "ObjectAccessor.h" #include "BattleGround.h" #include "MapManager.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "Util.h" #include "LootMgr.h" diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 9bcb7248b..c1c7517f3 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -30,7 +30,7 @@ #include "ObjectAccessor.h" #include "Language.h" #include "CellImpl.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "Mail.h" #include "Util.h" #ifdef _DEBUG_VMAPS diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 414583624..98cf09e2b 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -49,7 +49,7 @@ #include "Util.h" #include "ItemEnchantmentMgr.h" #include "BattleGroundMgr.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "InstanceData.h" #include "CreatureEventAIMgr.h" #include "DBCEnums.h" diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 7bdfeb6ee..3d6284bf8 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -34,7 +34,7 @@ #include "Group.h" #include "MapRefManager.h" #include "DBCEnums.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "VMapFactory.h" #include "BattleGroundMgr.h" diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index d6602429c..0c730a620 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -17,7 +17,7 @@ */ #include "MapManager.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "Policies/SingletonImp.h" #include "Database/DatabaseEnv.h" #include "Log.h" diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/MapPersistentStateMgr.cpp similarity index 99% rename from src/game/InstanceSaveMgr.cpp rename to src/game/MapPersistentStateMgr.cpp index d9b9156a4..e17a6500e 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/MapPersistentStateMgr.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "SQLStorages.h" #include "Player.h" diff --git a/src/game/InstanceSaveMgr.h b/src/game/MapPersistentStateMgr.h similarity index 100% rename from src/game/InstanceSaveMgr.h rename to src/game/MapPersistentStateMgr.h diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 01db167a2..f663c0d42 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -29,7 +29,7 @@ #include "Transports.h" #include "BattleGround.h" #include "WaypointMovementGenerator.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "ObjectMgr.h" void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ ) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 09fa04455..a18d1ce79 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -40,7 +40,7 @@ #include "Spell.h" #include "Chat.h" #include "AccountMgr.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "SpellAuras.h" #include "Util.h" #include "WaypointManager.h" diff --git a/src/game/Player.cpp b/src/game/Player.cpp index fb349afe0..12244414d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -34,7 +34,7 @@ #include "Channel.h" #include "ChannelMgr.h" #include "MapManager.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "InstanceData.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp index 882b1ab6d..dce8b5d10 100644 --- a/src/game/PoolManager.cpp +++ b/src/game/PoolManager.cpp @@ -21,7 +21,7 @@ #include "ObjectGuid.h" #include "ProgressBar.h" #include "Log.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "MapManager.h" #include "World.h" #include "Policies/SingletonImp.h" diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 88ce78feb..3d6f8b50d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -41,7 +41,7 @@ #include "Totem.h" #include "BattleGround.h" #include "InstanceData.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" #include "Path.h" diff --git a/src/game/World.cpp b/src/game/World.cpp index 90ec1e8f2..611aea382 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -57,7 +57,7 @@ #include "Database/DatabaseImpl.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" -#include "InstanceSaveMgr.h" +#include "MapPersistentStateMgr.h" #include "WaypointManager.h" #include "GMTicketMgr.h" #include "Util.h" diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 553f7519e..d6696587c 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 "11126" + #define REVISION_NR "11127" #endif // __REVISION_NR_H__ diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj index a5ecba586..5fdd55f86 100644 --- a/win/VC100/game.vcxproj +++ b/win/VC100/game.vcxproj @@ -422,7 +422,6 @@ - @@ -436,6 +435,7 @@ + @@ -582,7 +582,6 @@ - @@ -591,6 +590,7 @@ + diff --git a/win/VC100/game.vcxproj.filters b/win/VC100/game.vcxproj.filters index bd9eb97bd..93c46f44b 100644 --- a/win/VC100/game.vcxproj.filters +++ b/win/VC100/game.vcxproj.filters @@ -144,9 +144,6 @@ World/Handlers - - World/Handlers - World/Handlers @@ -165,6 +162,9 @@ World/Handlers + + World/Handlers + World/Handlers @@ -570,9 +570,6 @@ World/Handlers - - World/Handlers - World/Handlers @@ -582,6 +579,9 @@ World/Handlers + + World/Handlers + World/Handlers diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index 756bfb795..355ab6e2b 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -805,14 +805,6 @@ RelativePath="..\..\src\game\InstanceData.h" > - - - - @@ -849,6 +841,14 @@ RelativePath="..\..\src\game\MapManager.h" > + + + + diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 40c7760db..56ab5681f 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -798,14 +798,6 @@ RelativePath="..\..\src\game\InstanceData.h" > - - - - @@ -842,6 +834,14 @@ RelativePath="..\..\src\game\MapManager.h" > + + + +