[1541] Make gcc happy, and use UI64FMTD in log messages where argument is uint64 and SIZEFMTD for size(). Patch by DasBlub

DasBlub · NoFantasy · commit 8169cedbf8c1 · 2010-01-05T12:24:08.000Z
Make gcc happy, and use UI64FMTD in log messages where argument is uint64 and SIZEFMTD for size(). Patch by DasBlub git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1541 5f9c896b-1e26-0410-94da-f77f675e2462
diff --git a/base/escort_ai.cpp b/base/escort_ai.cpp
@@ -462,7 +462,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
     //disable npcflags
     m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
 
-    debug_log("SD2: EscortAI started with %u waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = %u", WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
+    debug_log("SD2: EscortAI started with " SIZEFMTD " waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = " UI64FMTD, WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
 
     CurrentWP = WaypointList.begin();
 
diff --git a/base/follower_ai.cpp b/base/follower_ai.cpp
@@ -304,7 +304,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
 
     m_creature->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
 
-    debug_log("SD2: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);
+    debug_log("SD2: FollowerAI start follow %s (GUID " UI64FMTD ")", pLeader->GetName(), m_uiLeaderGUID);
 }
 
 Player* FollowerAI::GetLeaderForFollower()
diff --git a/include/sc_creature.cpp b/include/sc_creature.cpp
@@ -441,7 +441,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, flo
     if (!pUnit || pUnit->GetTypeId() != TYPEID_PLAYER)
     {
         if (pUnit)
-            error_log("SD2: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
+            error_log("SD2: Creature " UI64FMTD " (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: " UI64FMTD ") to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
 
         return;
     }
diff --git a/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/scripts/eastern_kingdoms/karazhan/karazhan.cpp
@@ -362,19 +362,19 @@ bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 uiSend
             pPlayer->CLOSE_GOSSIP_MENU();
             if (pBarnesAI)
                 pBarnesAI->m_uiEventId = EVENT_OZ;
-            outstring_log("SD2: pPlayer (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
+            outstring_log("SD2: pPlayer (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
             pPlayer->CLOSE_GOSSIP_MENU();
             if (pBarnesAI)
                 pBarnesAI->m_uiEventId = EVENT_HOOD;
-            outstring_log("SD2: pPlayer (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
+            outstring_log("SD2: pPlayer (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
             pPlayer->CLOSE_GOSSIP_MENU();
             if (pBarnesAI)
                 pBarnesAI->m_uiEventId = EVENT_RAJ;
-            outstring_log("SD2: pPlayer (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
+            outstring_log("SD2: pPlayer (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", pPlayer->GetGUID());
             break;
     }
 
diff --git a/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
@@ -64,7 +64,7 @@ struct MANGOS_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
             for(uint8 i = 0; i < size; ++i)
             {
                 uint64 guid = m_pInstance->GetData64(DATA_FEL_CRYSTAL);
-                debug_log("SD2: Selin: Adding Fel Crystal %u to list", guid);
+                debug_log("SD2: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
                 Crystals.push_back(guid);
             }
         }
diff --git a/scripts/outland/black_temple/boss_shade_of_akama.cpp b/scripts/outland/black_temple/boss_shade_of_akama.cpp
@@ -193,7 +193,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         if (uiGuid)
         {
             if (m_lSorcerersGUIDList.empty())
-                error_log("SD2: boss_shade_of_akamaAI attempt to remove guid %u from Sorcerers list but list is already empty", uiGuid);
+                error_log("SD2: boss_shade_of_akamaAI attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", uiGuid);
             else
                 m_lSorcerersGUIDList.remove(uiGuid);
         }
@@ -284,7 +284,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
             for(std::list<Creature*>::iterator itr = lChannelerList.begin(); itr != lChannelerList.end(); ++itr)
             {
                 m_lChannelersGUIDList.push_back((*itr)->GetGUID());
-                debug_log("SD2: boss_shade_of_akamaAI found channeler %u. Adding to list", (*itr)->GetGUID());
+                debug_log("SD2: boss_shade_of_akamaAI found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
 
                 (*itr)->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             }
diff --git a/system/system.cpp b/system/system.cpp
@@ -189,7 +189,7 @@ void SystemMgr::LoadScriptWaypoints()
         delete pResult;
     }
 
-    outstring_log("SD2: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
+    outstring_log("SD2: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);
 
     pResult = SD2Database.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const`
`304`	`304`
`305`	`305`	`m_creature->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);`
`306`	`306`
`307`		`- debug_log("SD2: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);`
	`307`	`+ debug_log("SD2: FollowerAI start follow %s (GUID " UI64FMTD ")", pLeader->GetName(), m_uiLeaderGUID);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`Player* FollowerAI::GetLeaderForFollower()`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, flo`
`441`	`441`	`if (!pUnit \|\| pUnit->GetTypeId() != TYPEID_PLAYER)`
`442`	`442`	`{`
`443`	`443`	`if (pUnit)`
`444`		`- error_log("SD2: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);`
	`444`	`+ error_log("SD2: Creature " UI64FMTD " (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: " UI64FMTD ") to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);`
`445`	`445`
`446`	`446`	`return;`
`447`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct MANGOS_DLL_DECL boss_selin_fireheartAI : public ScriptedAI`
`64`	`64`	`for(uint8 i = 0; i < size; ++i)`
`65`	`65`	`{`
`66`	`66`	`uint64 guid = m_pInstance->GetData64(DATA_FEL_CRYSTAL);`
`67`		`- debug_log("SD2: Selin: Adding Fel Crystal %u to list", guid);`
	`67`	`+ debug_log("SD2: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);`
`68`	`68`	`Crystals.push_back(guid);`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI`
`193`	`193`	`if (uiGuid)`
`194`	`194`	`{`
`195`	`195`	`if (m_lSorcerersGUIDList.empty())`
`196`		`- error_log("SD2: boss_shade_of_akamaAI attempt to remove guid %u from Sorcerers list but list is already empty", uiGuid);`
	`196`	`+ error_log("SD2: boss_shade_of_akamaAI attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", uiGuid);`
`197`	`197`	`else`
`198`	`198`	`m_lSorcerersGUIDList.remove(uiGuid);`
`199`	`199`	`}`
`@@ -284,7 +284,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI`
`284`	`284`	`for(std::list<Creature*>::iterator itr = lChannelerList.begin(); itr != lChannelerList.end(); ++itr)`
`285`	`285`	`{`
`286`	`286`	`m_lChannelersGUIDList.push_back((*itr)->GetGUID());`
`287`		`- debug_log("SD2: boss_shade_of_akamaAI found channeler %u. Adding to list", (*itr)->GetGUID());`
	`287`	`+ debug_log("SD2: boss_shade_of_akamaAI found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());`
`288`	`288`
`289`	`289`	`(*itr)->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ void SystemMgr::LoadScriptWaypoints()`
`189`	`189`	`delete pResult;`
`190`	`190`	`}`
`191`	`191`
`192`		`- outstring_log("SD2: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);`
	`192`	`+ outstring_log("SD2: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);`
`193`	`193`
`194`	`194`	`pResult = SD2Database.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");`
`195`	`195`