[9545] Rename ObjectDefines.h -> ObjectGuid.h

Also move unrelated generic defines to Common.h

src/game/AccountMgr.cpp

@@ -19,7 +19,7 @@
 #include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"
 #include "Util.h"

src/game/ArenaTeam.cpp

@@ -18,7 +18,7 @@
 
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "ArenaTeam.h"
 #include "World.h"
 

src/game/AuctionHouseHandler.cpp

@@ -22,7 +22,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "AuctionHouseMgr.h"

src/game/AuctionHouseMgr.cpp

@@ -28,7 +28,7 @@
 #include "Language.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"

src/game/BattleGround.cpp

@@ -27,7 +27,7 @@
 #include "ArenaTeam.h"
 #include "World.h"
 #include "Group.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Util.h"

src/game/CharacterHandler.cpp

@@ -25,7 +25,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "Guild.h"
 #include "UpdateMask.h"

src/game/Chat.cpp

@@ -25,7 +25,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Chat.h"

src/game/CombatHandler.cpp

@@ -22,7 +22,7 @@
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 
 void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data )
 {

src/game/Corpse.cpp

@@ -21,7 +21,7 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "GossipDef.h"

src/game/Creature.cpp

@@ -21,7 +21,7 @@
 #include "WorldPacket.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "QuestDef.h"

src/game/CreatureEventAIMgr.cpp

@@ -24,7 +24,7 @@
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "GridDefines.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);

src/game/DBCStores.cpp

@@ -21,7 +21,7 @@
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 
 #include "DBCfmt.h"
 

src/game/GMTicketMgr.cpp

@@ -21,11 +21,11 @@
 #include "Database/SQLStorage.h"
 #include "GMTicketMgr.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "Player.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 
 INSTANTIATE_SINGLETON_1(GMTicketMgr);
 

src/game/GameEventMgr.cpp

@@ -19,7 +19,7 @@
 #include "GameEventMgr.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "PoolManager.h"
 #include "ProgressBar.h"
 #include "Language.h"

src/game/GlobalEvents.cpp

@@ -27,7 +27,7 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "GlobalEvents.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Corpse.h"
 
 static void CorpsesEraseCallBack(QueryResult *result, bool bones)

src/game/Group.cpp

@@ -23,7 +23,7 @@
 #include "Player.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Group.h"
 #include "Formulas.h"
 #include "ObjectAccessor.h"

src/game/Guild.h

@@ -24,7 +24,6 @@
 
 #include "Common.h"
 #include "Item.h"
-#include "ObjectDefines.h"
 
 class Item;
 

src/game/InstanceSaveMgr.h

@@ -27,7 +27,7 @@
 #include "Utilities/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 
 struct InstanceTemplate;
 struct MapEntry;

src/game/Item.cpp

@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"

src/game/Level2.cpp

@@ -20,7 +20,7 @@
 #include "Database/DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "Item.h"
 #include "GameObject.h"

src/game/LootHandler.cpp

@@ -23,7 +23,7 @@
 #include "GameObject.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "WorldSession.h"
 #include "LootMgr.h"
 #include "Object.h"

src/game/Mail.cpp

@@ -32,7 +32,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Unit.h"

src/game/Makefile.am

@@ -194,7 +194,7 @@ libmangosgame_a_SOURCES = \
 	ObjectAccessor.cpp \
 	ObjectAccessor.h \
 	Object.cpp \
-	ObjectDefines.h \
+	ObjectGuid.h \
 	ObjectGridLoader.cpp \
 	ObjectGridLoader.h \
 	Object.h \

src/game/MiscHandler.cpp

@@ -26,7 +26,7 @@
 #include "Player.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "WorldSession.h"
 #include "Auth/BigNumber.h"
 #include "Auth/Sha1.h"

src/game/Object.cpp

@@ -27,7 +27,7 @@
 #include "Player.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"

src/game/Object.h

@@ -24,7 +24,7 @@
 #include "UpdateFields.h"
 #include "UpdateData.h"
 #include "GameSystem/GridReference.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 
 #include <set>
 #include <string>

src/game/ObjectAccessor.cpp

@@ -33,7 +33,7 @@
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
 #include "Opcodes.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "MapInstanced.h"
 #include "World.h"
 

src/game/ObjectGuid.h

@@ -16,20 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MANGOS_OBJECTDEFINES_H
-#define MANGOS_OBJECTDEFINES_H
+#ifndef MANGOS_OBJECT_GUID_H
+#define MANGOS_OBJECT_GUID_H
 
 #include "Platform/Define.h"
 
-// used for creating values for respawn for example
-#define MAKE_PAIR64(l, h)  uint64( uint32(l) | ( uint64(h) << 32 ) )
-#define PAIR64_HIPART(x)   (uint32)((uint64(x) >> 32) & UI64LIT(0x00000000FFFFFFFF))
-#define PAIR64_LOPART(x)   (uint32)(uint64(x)         & UI64LIT(0x00000000FFFFFFFF))
-
-#define MAKE_PAIR32(l, h)  uint32( uint16(l) | ( uint32(h) << 16 ) )
-#define PAIR32_HIPART(x)   (uint16)((uint32(x) >> 16) & 0x0000FFFF)
-#define PAIR32_LOPART(x)   (uint16)(uint32(x)         & 0x0000FFFF)
-
 enum HighGuid
 {
     HIGHGUID_ITEM           = 0x4000,                       // blizz 4000

src/game/ObjectMgr.cpp

@@ -25,7 +25,7 @@
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "SpellMgr.h"
 #include "UpdateMask.h"
 #include "World.h"

src/game/ObjectMgr.h

@@ -34,7 +34,7 @@
 #include "Mail.h"
 #include "Map.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Policies/Singleton.h"
 #include "Database/SQLStorage.h"
 

src/game/Pet.h

@@ -19,7 +19,7 @@
 #ifndef MANGOSSERVER_PET_H
 #define MANGOSSERVER_PET_H
 
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Creature.h"
 #include "Unit.h"
 

src/game/PetitionsHandler.cpp

@@ -22,7 +22,7 @@
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"

src/game/Player.cpp

@@ -42,7 +42,7 @@
 #include "CellImpl.h"
 #include "ObjectMgr.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "CreatureAI.h"
 #include "Formulas.h"
 #include "Group.h"

src/game/PoolManager.cpp

@@ -18,7 +18,7 @@
 
 #include "PoolManager.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"

src/game/QueryHandler.cpp

@@ -26,7 +26,7 @@
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "NPCHandler.h"

src/game/SocialMgr.cpp

@@ -23,7 +23,7 @@
 #include "WorldPacket.h"
 #include "Player.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "World.h"
 #include "Util.h"
 

src/game/Transports.cpp

@@ -21,7 +21,7 @@
 #include "Transports.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Path.h"
 
 #include "WorldPacket.h"

src/game/Unit.cpp

@@ -23,7 +23,7 @@
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "SpellMgr.h"
 #include "Unit.h"
 #include "QuestDef.h"

src/game/Vehicle.h

@@ -19,7 +19,7 @@
 #ifndef MANGOSSERVER_VEHICLE_H
 #define MANGOSSERVER_VEHICLE_H
 
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Creature.h"
 #include "Unit.h"
 

src/game/debugcmds.cpp

@@ -30,7 +30,7 @@
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "SpellMgr.h"
 
 bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args)

src/game/pchdef.h

@@ -5,7 +5,7 @@
 #include "MapManager.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "ObjectDefines.h"
+#include "ObjectGuid.h"
 #include "Database/SQLStorage.h"
 #include "Opcodes.h"
 #include "SharedDefines.h"

src/shared/Common.h

@@ -150,6 +150,15 @@ inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
 
 #define STRINGIZE(a) #a
 
+// used for creating values for respawn for example
+#define MAKE_PAIR64(l, h)  uint64( uint32(l) | ( uint64(h) << 32 ) )
+#define PAIR64_HIPART(x)   (uint32)((uint64(x) >> 32) & UI64LIT(0x00000000FFFFFFFF))
+#define PAIR64_LOPART(x)   (uint32)(uint64(x)         & UI64LIT(0x00000000FFFFFFFF))
+
+#define MAKE_PAIR32(l, h)  uint32( uint16(l) | ( uint32(h) << 16 ) )
+#define PAIR32_HIPART(x)   (uint16)((uint32(x) >> 16) & 0x0000FFFF)
+#define PAIR32_LOPART(x)   (uint16)(uint32(x)         & 0x0000FFFF)
+
 enum TimeConstants
 {
     MINUTE = 60,

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9544"
+ #define REVISION_NR "9545"
 #endif // __REVISION_NR_H__

win/VC100/game.vcxproj

@@ -576,7 +576,7 @@
     <ClInclude Include="..\..\src\game\NullCreatureAI.h" />
     <ClInclude Include="..\..\src\game\Object.h" />
     <ClInclude Include="..\..\src\game\ObjectAccessor.h" />
-    <ClInclude Include="..\..\src\game\ObjectDefines.h" />
+    <ClInclude Include="..\..\src\game\ObjectGuid.h" />
     <ClInclude Include="..\..\src\game\ObjectGridLoader.h" />
     <ClInclude Include="..\..\src\game\ObjectMgr.h" />
     <ClInclude Include="..\..\src\game\ObjectPosSelector.h" />

win/VC80/game.vcproj

@@ -1310,7 +1310,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectDefines.h"
+				RelativePath="..\..\src\game\ObjectGuid.h"
 				>
 			</File>
 			<File

win/VC90/game.vcproj

@@ -1311,7 +1311,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectDefines.h"
+				RelativePath="..\..\src\game\ObjectGuid.h"
 				>
 			</File>
 			<File