Skip to content

Commit 983a9e6

Browse files
xezonxezon
committed
[GEN][ZH] Polish debug logging strings by hand (#1232)
1 parent 67e59c4 commit 983a9e6

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
@@ -524,7 +524,7 @@ void PerfTimer::outputInfo( void )
524524
#endif
525525

526526
if (m_crashWithInfo) {
527-
DEBUG_CRASH(("%s"
527+
DEBUG_CRASH(("%s\n"
528528
"Average Time (per call): %.4f ms\n"
529529
"Average Time (per frame): %.4f ms\n"
530530
"Average calls per frame: %.2f\n"
@@ -537,7 +537,7 @@ void PerfTimer::outputInfo( void )
537537
m_callCount,
538538
1000.0f / avgTimePerFrame));
539539
} else {
540-
DEBUG_LOG(("%s"
540+
DEBUG_LOG(("%s\n"
541541
"Average Time (per call): %.4f ms\n"
542542
"Average Time (per frame): %.4f ms\n"
543543
"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
@@ -5421,7 +5421,7 @@ void InGameUI::showIdleWorkerLayout( void )
54215421
if (!m_idleWorkerWin)
54225422
{
54235423
m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
5424-
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
5424+
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
54255425
return;
54265426
}
54275427

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

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
13301330
allocateInfo(pos);
13311331
}
13321332
if (!m_info) {
1333-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1333+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13341334
return;
13351335
}
13361336
m_info->m_goalUnitID = unitID;
@@ -1366,7 +1366,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
13661366
allocateInfo(pos);
13671367
}
13681368
if (!m_info) {
1369-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1369+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13701370
return;
13711371
}
13721372
m_info->m_goalAircraftID = unitID;
@@ -1402,7 +1402,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
14021402
allocateInfo(pos);
14031403
}
14041404
if (!m_info) {
1405-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1405+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
14061406
return;
14071407
}
14081408
if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -5438,9 +5438,8 @@ void Pathfinder::processPathfindQueue(void)
54385438
timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
54395439
if (timeToUpdate>0.01f)
54405440
{
5441-
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5442-
DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
5443-
DEBUG_LOG((""));
5441+
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5442+
DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
54445443
}
54455444
#endif
54465445
#endif
@@ -6197,8 +6196,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
61976196
Bool valid;
61986197
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
61996198

6200-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6201-
DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d", from->x, from->y, to->x, to->y, valid));
6199+
DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
62026200
DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
62036201
}
62046202
#endif
@@ -6815,8 +6813,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
68156813
}
68166814
#endif
68176815

6818-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6819-
DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
6816+
DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
68206817
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
68216818

68226819
#ifdef DUMP_PERF_STATS
@@ -7431,8 +7428,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
74317428
}
74327429
#endif
74337430

7434-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7435-
DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7431+
DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
74367432
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
74377433

74387434
#ifdef DUMP_PERF_STATS
@@ -8326,8 +8322,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
83268322
}
83278323
#endif
83288324

8329-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8330-
DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
8325+
DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
83318326
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
83328327
#ifdef INTENSE_DEBUG
83338328
TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
@@ -8352,8 +8347,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
83528347
Bool valid;
83538348
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
83548349

8355-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8356-
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
8350+
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));
83578351
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
83588352
#endif
83598353
#if defined RTS_DEBUG || defined RTS_INTERNAL
@@ -9746,8 +9740,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
97469740
debugShowSearch(true);
97479741
#endif
97489742

9749-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
9750-
DEBUG_LOG(("getMoveAwayFromPath pathfind failed -- "));
9743+
DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
97519744
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
97529745

97539746
m_isTunneling = false;
@@ -9925,8 +9918,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
99259918
}
99269919
}
99279920

9928-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
9929-
DEBUG_LOG(("patchPath Pathfind failed -- "));
9921+
DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
99309922
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
99319923

99329924
#if defined RTS_DEBUG || defined RTS_INTERNAL
@@ -10226,8 +10218,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
1022610218
return path;
1022710219
}
1022810220
#if defined RTS_DEBUG || defined RTS_INTERNAL
10229-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10230-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10221+
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));
1023110222
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1023210223
#endif
1023310224
#endif
@@ -10387,8 +10378,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
1038710378
#endif
1038810379
#if 0
1038910380
#if defined RTS_DEBUG || defined RTS_INTERNAL
10390-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10391-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10381+
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));
1039210382
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1039310383
#endif
1039410384
#endif

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

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

‎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
@@ -604,7 +604,7 @@ void PerfTimer::outputInfo( void )
604604
#endif
605605

606606
if (m_crashWithInfo) {
607-
DEBUG_CRASH(("%s"
607+
DEBUG_CRASH(("%s\n"
608608
"Average Time (per call): %.4f ms\n"
609609
"Average Time (per frame): %.4f ms\n"
610610
"Average calls per frame: %.2f\n"
@@ -617,7 +617,7 @@ void PerfTimer::outputInfo( void )
617617
m_callCount,
618618
1000.0f / avgTimePerFrame));
619619
} else {
620-
DEBUG_LOG(("%s"
620+
DEBUG_LOG(("%s\n"
621621
"Average Time (per call): %.4f ms\n"
622622
"Average Time (per frame): %.4f ms\n"
623623
"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
@@ -5593,7 +5593,7 @@ void InGameUI::showIdleWorkerLayout( void )
55935593
if (!m_idleWorkerWin)
55945594
{
55955595
m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
5596-
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
5596+
DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
55975597
return;
55985598
}
55995599

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

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
13481348
allocateInfo(pos);
13491349
}
13501350
if (!m_info) {
1351-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1351+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13521352
return;
13531353
}
13541354
m_info->m_goalUnitID = unitID;
@@ -1384,7 +1384,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
13841384
allocateInfo(pos);
13851385
}
13861386
if (!m_info) {
1387-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1387+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
13881388
return;
13891389
}
13901390
m_info->m_goalAircraftID = unitID;
@@ -1420,7 +1420,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
14201420
allocateInfo(pos);
14211421
}
14221422
if (!m_info) {
1423-
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
1423+
DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
14241424
return;
14251425
}
14261426
if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -5956,9 +5956,8 @@ void Pathfinder::processPathfindQueue(void)
59565956
timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
59575957
if (timeToUpdate>0.01f)
59585958
{
5959-
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5960-
DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
5961-
DEBUG_LOG((""));
5959+
DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
5960+
DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
59625961
}
59635962
#endif
59645963
#endif
@@ -6719,8 +6718,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
67196718
Bool valid;
67206719
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
67216720

6722-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
6723-
DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d", from->x, from->y, to->x, to->y, valid));
6721+
DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
67246722
DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
67256723
}
67266724
#endif
@@ -7363,8 +7361,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
73637361
}
73647362
#endif
73657363

7366-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7367-
DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7364+
DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
73687365
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
73697366

73707367
#ifdef DUMP_PERF_STATS
@@ -7993,8 +7990,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
79937990
}
79947991
#endif
79957992

7996-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
7997-
DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)", from->x, from->y, to->x, to->y));
7993+
DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
79987994
DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
79997995

80007996
#ifdef DUMP_PERF_STATS
@@ -8953,8 +8949,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
89538949
}
89548950
#endif
89558951

8956-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8957-
DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
8952+
DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
89588953
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
89598954
#ifdef INTENSE_DEBUG
89608955
TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
@@ -8979,8 +8974,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
89798974
Bool valid;
89808975
valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
89818976

8982-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
8983-
DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
8977+
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));
89848978
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
89858979
#endif
89868980
#if defined RTS_DEBUG || defined RTS_INTERNAL
@@ -10395,8 +10389,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
1039510389
debugShowSearch(true);
1039610390
#endif
1039710391

10398-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
10399-
DEBUG_LOG(("getMoveAwayFromPath pathfind failed -- "));
10392+
DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
1040010393
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1040110394

1040210395
m_isTunneling = false;
@@ -10574,8 +10567,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
1057410567
}
1057510568
}
1057610569

10577-
DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
10578-
DEBUG_LOG(("patchPath Pathfind failed -- "));
10570+
DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
1057910571
DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1058010572

1058110573
#if defined RTS_DEBUG || defined RTS_INTERNAL
@@ -10933,8 +10925,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
1093310925
return path;
1093410926
}
1093510927
#if defined RTS_DEBUG || defined RTS_INTERNAL
10936-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
10937-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
10928+
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));
1093810929
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1093910930
#endif
1094010931
#endif
@@ -11094,8 +11085,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
1109411085
#endif
1109511086
#if 0
1109611087
#if defined RTS_DEBUG || defined RTS_INTERNAL
11097-
DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
11098-
DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- ", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
11088+
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));
1109911089
DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(), victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
1110011090
#endif
1110111091
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ void W3DGhostObject::removeParentObject(void)
423423
robj=w3dDraw->getRenderObject();
424424
if (robj)
425425
{
426-
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene "));
426+
DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene"));
427427
robj->Remove();
428428
}
429429
}

0 commit comments

Comments
 (0)