Skip to content

Commit 6225998

Browse files
xezonxezon
committed
[GEN][ZH] Polish debug logging strings by hand (#1232)
1 parent 9c662f7 commit 6225998

File tree

12 files changed

+40
-60
lines changed

12 files changed

+40
-60
lines changed

‎Generals/Code/GameEngine/Source/Common/PerfTimer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ void PerfTimer::outputInfo( void )
519519
#endif
520520

521521
if (m_crashWithInfo) {
522-
DEBUG_CRASH(("%s"
522+
DEBUG_CRASH(("%s\n"
523523
"Average Time (per call): %.4f ms\n"
524524
"Average Time (per frame): %.4f ms\n"
525525
"Average calls per frame: %.2f\n"
@@ -532,7 +532,7 @@ void PerfTimer::outputInfo( void )
532532
m_callCount,
533533
1000.0f / avgTimePerFrame));
534534
} else {
535-
DEBUG_LOG(("%s"
535+
DEBUG_LOG(("%s\n"
536536
"Average Time (per call): %.4f ms\n"
537537
"Average Time (per frame): %.4f ms\n"
538538
"Average calls per frame: %.2f\n"

‎Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5416,7 +5416,7 @@ void InGameUI::showIdleWorkerLayout( void )
54165416
if (!m_idleWorkerWin)
54175417
{
54185418
m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
5419-
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
5419+
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
54205420
return;
54215421
}
54225422

‎Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
13251325
allocateInfo(pos);
13261326
}
13271327
if (!m_info) {
1328-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1328+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13291329
return;
13301330
}
13311331
m_info->m_goalUnitID = unitID;
@@ -1361,7 +1361,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
13611361
allocateInfo(pos);
13621362
}
13631363
if (!m_info) {
1364-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1364+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13651365
return;
13661366
}
13671367
m_info->m_goalAircraftID = unitID;
@@ -1397,7 +1397,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
13971397
allocateInfo(pos);
13981398
}
13991399
if (!m_info) {
1400-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1400+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
14011401
return;
14021402
}
14031403
if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -5433,9 +5433,8 @@ void Pathfinder::processPathfindQueue(void)
54335433
timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
54345434
if (timeToUpdate>0.01f)
54355435
{
5436-
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5437-
DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
5438-
DEBUG_LOG((""));
5436+
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5437+
DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
54395438
}
54405439
#endif
54415440
#endif
@@ -6192,8 +6191,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
61926191
Bool valid;
61936192
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
61946193

6195-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6196-
DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d", from->x, from->y, to->x, to->y, valid));
6194+
DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
61976195
DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
61986196
}
61996197
#endif
@@ -6810,8 +6808,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
68106808
}
68116809
#endif
68126810

6813-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6814-
DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
6811+
DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
68156812
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
68166813

68176814
#ifdef DUMP_PERF_STATS
@@ -7426,8 +7423,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
74267423
}
74277424
#endif
74287425

7429-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7430-
DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7426+
DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
74317427
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
74327428

74337429
#ifdef DUMP_PERF_STATS
@@ -8321,8 +8317,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
83218317
}
83228318
#endif
83238319

8324-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8325-
DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
8320+
DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
83268321
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
83278322
#ifdef INTENSE_DEBUG
83288323
TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
@@ -8347,8 +8342,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
83478342
Bool valid;
83488343
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
83498344

8350-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8351-
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
8345+
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
83528346
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
83538347
#endif
83548348
#if defined(RTS_DEBUG)
@@ -9741,8 +9735,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
97419735
debugShowSearch(true);
97429736
#endif
97439737

9744-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
9745-
DEBUG_LOG(("getMoveAwayFromPath pathfind failed -- "));
9738+
DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
97469739
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
97479740

97489741
m_isTunneling = false;
@@ -9920,8 +9913,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
99209913
}
99219914
}
99229915

9923-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
9924-
DEBUG_LOG(("patchPath Pathfind failed -- "));
9916+
DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
99259917
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
99269918

99279919
#if defined(RTS_DEBUG)
@@ -10221,8 +10213,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
1022110213
return path;
1022210214
}
1022310215
#if defined(RTS_DEBUG)
10224-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10225-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10216+
DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
1022610217
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1022710218
#endif
1022810219
#endif
@@ -10382,8 +10373,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
1038210373
#endif
1038310374
#if 0
1038410375
#if defined(RTS_DEBUG)
10385-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10386-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10376+
DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
1038710377
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1038810378
#endif
1038910379
#endif

‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ void W3DGhostObject::removeParentObject(void)
414414
robj=w3dDraw->getRenderObject();
415415
if (robj)
416416
{
417-
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene "));
417+
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene"));
418418
robj->Remove();
419419
}
420420
}

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ void DX8Wrapper::Draw(
19031903
#ifdef MESH_RENDER_SNAPSHOT_ENABLED
19041904
if (WW3D::Is_Snapshot_Activated()) {
19051905
unsigned long passes=0;
1906-
SNAPSHOT_SAY(("ValidateDevice: "));
1906+
SNAPSHOT_SAY(("ValidateDevice:"));
19071907
HRESULT res=D3DDevice->ValidateDevice(&passes);
19081908
switch (res) {
19091909
case D3D_OK:

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ void SortingRendererClass::Flush_Sorting_Pool()
518518
{
519519
if (!overlapping_node_count) return;
520520

521-
SNAPSHOT_SAY(("SortingSystem - Flush "));
521+
SNAPSHOT_SAY(("SortingSystem - Flush"));
522522

523523
unsigned node_id;
524524
// Fill dynamic index buffer with sorting index buffer vertices

‎GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ void PerfTimer::outputInfo( void )
599599
#endif
600600

601601
if (m_crashWithInfo) {
602-
DEBUG_CRASH(("%s"
602+
DEBUG_CRASH(("%s\n"
603603
"Average Time (per call): %.4f ms\n"
604604
"Average Time (per frame): %.4f ms\n"
605605
"Average calls per frame: %.2f\n"
@@ -612,7 +612,7 @@ void PerfTimer::outputInfo( void )
612612
m_callCount,
613613
1000.0f / avgTimePerFrame));
614614
} else {
615-
DEBUG_LOG(("%s"
615+
DEBUG_LOG(("%s\n"
616616
"Average Time (per call): %.4f ms\n"
617617
"Average Time (per frame): %.4f ms\n"
618618
"Average calls per frame: %.2f\n"

‎GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5588,7 +5588,7 @@ void InGameUI::showIdleWorkerLayout( void )
55885588
if (!m_idleWorkerWin)
55895589
{
55905590
m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
5591-
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
5591+
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
55925592
return;
55935593
}
55945594

‎GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
13431343
allocateInfo(pos);
13441344
}
13451345
if (!m_info) {
1346-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1346+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13471347
return;
13481348
}
13491349
m_info->m_goalUnitID = unitID;
@@ -1379,7 +1379,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
13791379
allocateInfo(pos);
13801380
}
13811381
if (!m_info) {
1382-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1382+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13831383
return;
13841384
}
13851385
m_info->m_goalAircraftID = unitID;
@@ -1415,7 +1415,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
14151415
allocateInfo(pos);
14161416
}
14171417
if (!m_info) {
1418-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1418+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
14191419
return;
14201420
}
14211421
if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -5951,9 +5951,8 @@ void Pathfinder::processPathfindQueue(void)
59515951
timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
59525952
if (timeToUpdate>0.01f)
59535953
{
5954-
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5955-
DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
5956-
DEBUG_LOG((""));
5954+
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5955+
DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
59575956
}
59585957
#endif
59595958
#endif
@@ -6714,8 +6713,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
67146713
Bool valid;
67156714
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
67166715

6717-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6718-
DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d", from->x, from->y, to->x, to->y, valid));
6716+
DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
67196717
DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
67206718
}
67216719
#endif
@@ -7358,8 +7356,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
73587356
}
73597357
#endif
73607358

7361-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7362-
DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7359+
DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
73637360
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
73647361

73657362
#ifdef DUMP_PERF_STATS
@@ -7988,8 +7985,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
79887985
}
79897986
#endif
79907987

7991-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7992-
DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7988+
DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
79937989
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
79947990

79957991
#ifdef DUMP_PERF_STATS
@@ -8948,8 +8944,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
89488944
}
89498945
#endif
89508946

8951-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8952-
DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
8947+
DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
89538948
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
89548949
#ifdef INTENSE_DEBUG
89558950
TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
@@ -8974,8 +8969,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
89748969
Bool valid;
89758970
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
89768971

8977-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8978-
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
8972+
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
89798973
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
89808974
#endif
89818975
#if defined(RTS_DEBUG)
@@ -10390,8 +10384,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
1039010384
debugShowSearch(true);
1039110385
#endif
1039210386

10393-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
10394-
DEBUG_LOG(("getMoveAwayFromPath pathfind failed -- "));
10387+
DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
1039510388
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1039610389

1039710390
m_isTunneling = false;
@@ -10569,8 +10562,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
1056910562
}
1057010563
}
1057110564

10572-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
10573-
DEBUG_LOG(("patchPath Pathfind failed -- "));
10565+
DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
1057410566
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1057510567

1057610568
#if defined(RTS_DEBUG)
@@ -10928,8 +10920,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
1092810920
return path;
1092910921
}
1093010922
#if defined(RTS_DEBUG)
10931-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10932-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10923+
DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
1093310924
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1093410925
#endif
1093510926
#endif
@@ -11089,8 +11080,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
1108911080
#endif
1109011081
#if 0
1109111082
#if defined(RTS_DEBUG)
11092-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
11093-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
11083+
DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
1109411084
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1109511085
#endif
1109611086
#endif

‎GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ void W3DGhostObject::removeParentObject(void)
418418
robj=w3dDraw->getRenderObject();
419419
if (robj)
420420
{
421-
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene "));
421+
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene"));
422422
robj->Remove();
423423
}
424424
}

0 commit comments

Comments
 (0)