Skip to content

Commit

Permalink
Revert "fprintf for debugging trade route loss", causes "No such obje…
Browse files Browse the repository at this point in the history 
…ct":

This reverts commit 81ae687.

Thread 1 "ctp2" hit Catchpoint 1 (signal SIGSEGV), 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296
296		PLAYER_INDEX GetOwner () const { return m_owner; };
#0  0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296
civctp2#1  0x000055555609176a in Unit::GetOwner (this=0x7fffffffe254) at Unit.cpp:397
civctp2#2  0x000055555608c847 in TradeRoute::RemoveAllReferences (this=0x7fffffffe2b4, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:70
civctp2#3  0x000055555608c5c8 in TradeRoute::KillRoute (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:35
civctp2#4  0x000055555578fe0a in TradeRoute::Kill (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at ../ctp2_code/gs/gameobj/TradeRoute.h:51
civctp2#5  0x000055555600928e in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:582
civctp2#6  0x0000555556009474 in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:605
civctp2#7  0x000055555609854e in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:384
civctp2#8  0x0000555556098632 in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:389
civctp2#9  0x0000555556043975 in GameObj_Delete (p=0x55555f74099c, id=268435500) at GameObj.cpp:190
civctp2#10 0x0000555556052801 in ObjPool::Del (this=0x55555f74082c, id=...) at ObjPool.cpp:106
civctp2#11 0x0000555556091284 in Unit::RemoveAllReferences (this=0x7fffffffe474, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:293
civctp2#12 0x0000555556090a78 in Unit::KillUnit (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:126
civctp2#13 0x00005555558bcf50 in Unit::Kill (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at ../ctp2_code/gs/gameobj/Unit.h:108
civctp2#14 0x000055555601796c in CityData::CityToPark (this=0x55555f9935ac, agressor=1) at CityData.cpp:5981
civctp2#15 0x00005555560a0d68 in UnitData::CityToPark (this=0x55555f99327c, agressor=1) at UnitData.cpp:3191
civctp2#16 0x0000555556094405 in Unit::CityToPark (this=0x7fffffffe5a0, agressor=1) at Unit.cpp:1522
civctp2#17 0x00005555560c6107 in CreateParkEvent::GEVHookCallback (this=0x55555674d980 <s_CreateParkEvent>, gameEventType=GEV_CreatePark, args=0x555582a0543c) at CityEvent.cpp:662
civctp2#18 0x0000555555fc0470 in GameEventHook::Activate (this=0x55555ef016cc, args=0x555582a0543c, startIndex=0, resumeIndex=@0x555582a062bc: 1) at GameEventHook.cpp:254
civctp2#19 0x0000555555fbd934 in GameEventManager::ActivateHook (this=0x55555eee50ac, type=GEV_CreatePark, args=0x555582a0543c, startIndex=-1, resumeIndex=@0x555582a062bc: 1) at GameEventManager.cpp:511
civctp2#20 0x0000555555fbfe97 in GameEvent::Process (this=0x555582a062ac) at GameEvent.cpp:112
civctp2#21 0x0000555555fbd624 in GameEventManager::ProcessHead (this=0x55555eee50ac) at GameEventManager.cpp:440
civctp2#22 0x0000555555fbd553 in GameEventManager::Process (this=0x55555eee50ac) at GameEventManager.cpp:415
civctp2#23 0x0000555555780ec7 in CivApp::Process (this=0x555556caec9c) at ctp/civapp.cpp:2563
civctp2#24 0x0000555555776c68 in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecb8) at ctp/civ3_main.cpp:1694
civctp2#25 0x0000555555776805 in main (argc=2, argv=0x7fffffffecb8) at ctp/civ3_main.cpp:1440
  • Loading branch information
@LynxAbraxas
LynxAbraxas committed Dec 30, 2019
1 parent cda327d commit 679ee1f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion ctp2_code/ai/CityManagement/governor.cpp
View file
Expand Up @@ -5162,7 +5162,6 @@ void Governor::ManageGoodsTradeRoutes()
{
unused_freight += curDestRoute->GetCost();

fprintf(stderr, "%s L%d: sellingPrice: %d, maxPrice: %d, PiracyRisk: %d!\n", __FILE__, __LINE__, sellingPrice, maxPrice, Diplomat::GetDiplomat(m_playerId).GetTradeRoutePiracyRisk(city, curDestRoute->GetDestination()));
g_gevManager->AddEvent(GEV_INSERT_Tail, GEV_KillTradeRoute,
GEA_TradeRoute, curDestRoute.m_id,
GEA_Int, CAUSE_KILL_TRADE_ROUTE_SENDER_KILLED,
Expand Down
5 changes: 0 additions & 5 deletions ctp2_code/gs/gameobj/CityData.cpp
View file
Expand Up @@ -4421,7 +4421,6 @@ void CityData::CalculateTradeRoutes(bool projectedOnly)
{
if(!projectedOnly)
{
fprintf(stderr, "%s L%d: deadRoutes, resource: %d, m_collectingResources: %d, m_sellingResources: %d, i: %d!\n", __FILE__, __LINE__, routeResource, m_collectingResources[routeResource], m_sellingResources[routeResource], i);
deadRoutes.Insert(route);
}
}
Expand All @@ -4432,7 +4431,6 @@ void CityData::CalculateTradeRoutes(bool projectedOnly)
{
if(m_food_delta < routeResource && !projectedOnly)
{
fprintf(stderr, "%s L%d: deadRoutes!\n", __FILE__, __LINE__);
deadRoutes.Insert(route);
}
break;
Expand Down Expand Up @@ -4466,7 +4464,6 @@ void CityData::CalculateTradeRoutes(bool projectedOnly)
{
if(g_player[m_owner]->GetGold() < route.GetGoldInReturn()) // kill route because of not enough gold to pay for the resource
{
fprintf(stderr, "%s L%d: deadRoutes!\n", __FILE__, __LINE__);
deadRoutes.Insert(route);
killRoute = true;
}
Expand Down Expand Up @@ -4497,15 +4494,13 @@ void CityData::CalculateTradeRoutes(bool projectedOnly)
{
if(deadRoutes[i].GetSource().m_id == m_home_city.m_id)
{
fprintf(stderr, "%s L%d: KillTradeRoute!\n", __FILE__, __LINE__);
g_gevManager->AddEvent(GEV_INSERT_Tail, GEV_KillTradeRoute,
GEA_TradeRoute, deadRoutes[i],
GEA_Int, CAUSE_KILL_TRADE_ROUTE_SENDER_KILLED,
GEA_End);
}
else
{
fprintf(stderr, "%s L%d: KillTradeRoute!\n", __FILE__, __LINE__);
g_gevManager->AddEvent(GEV_INSERT_Tail, GEV_KillTradeRoute,
GEA_TradeRoute, deadRoutes[i],
GEA_Int, CAUSE_KILL_TRADE_ROUTE_RECIPIENT_KILLED,
Expand Down
4 changes: 0 additions & 4 deletions ctp2_code/gs/gameobj/TradeRoute.cpp
View file
Expand Up @@ -64,10 +64,6 @@ void TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE cause)
}
// }
}
ROUTE_TYPE type;
sint32 good;
GetSourceResource(type, good);
fprintf(stderr, "%s L%d: Kill trade route cause: %d, owner: %d, resource: %d!\n", __FILE__, __LINE__, cause, source.GetOwner(), good);

if ((NULL != g_player) &&
(NULL != g_player[GetPayingFor()])) {
Expand Down

0 comments on commit 679ee1f

Please sign in to comment.