diff --git a/src/command_func.h b/src/command_func.h index 1494b618b2..89490df342 100644 --- a/src/command_func.h +++ b/src/command_func.h @@ -410,7 +410,7 @@ protected: if (desync_log) LogCommandExecution(Tcmd, err_message, EndianBufferWriter::FromValue(args), false); - Debug(misc, 0, "EXEC {}/{} {} {}({}) seed={} company={} tile={}", TimerGameCalendar::date, TimerGameCalendar::date_fract, _frame_counter, GetCommandName(Tcmd), Tcmd, _random.state[0] & 0xFF, _current_company, tile); + // Debug(misc, 0, "EXEC {}/{} {} {}({}) seed={} company={} tile={}", TimerGameCalendar::date, TimerGameCalendar::date_fract, _frame_counter, GetCommandName(Tcmd), Tcmd, _random.state[0] & 0xFF, _current_company, tile); /* Actually try and execute the command. */ Tret res2 = std::apply(CommandTraits::proc, std::tuple_cat(std::make_tuple(flags | DoCommandFlag::Execute), args)); diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index e0707fbd7e..deb80fc3e1 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -1463,7 +1463,6 @@ void SetCompanyManagerFaceStyle(CompanyManagerFace &cmf, uint style) cmf.style = style; cmf.style_label = spec->label; - Debug(misc, 0, "Set face style {} {}", cmf.style, cmf.style_label); } /** diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index ed4f72da66..117c6187f8 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -604,7 +604,6 @@ static void StartScripts() bool AfterLoadGame() { SetSignalHandlers(); - Debug(net, 0, "State before AfterLoad {}", _random.state[0]); extern TileIndex _cur_tileloop_tile; // From landscape.cpp. /* The LFSR used in RunTileLoop iteration cannot have a zeroed state, make it non-zeroed. */ @@ -763,7 +762,6 @@ bool AfterLoadGame() ResetSignalHandlers(); return false; } - Debug(net, 0, "AfterLoad state A {}", _random.state[0]); switch (gcf_res) { case GLC_COMPATIBLE: ShowErrorMessage(GetEncodedString(STR_NEWGRF_COMPATIBLE_LOAD_WARNING), {}, WL_CRITICAL); break; @@ -868,8 +866,6 @@ bool AfterLoadGame() /* Old orders are no longer needed. */ ClearOldOrders(); - Debug(net, 0, "AfterLoad state B {}", _random.state[0]); - /* make sure there is a town in the game */ if (_game_mode == GM_NORMAL && Town::GetNumItems() == 0) { SetSaveLoadError(STR_ERROR_NO_TOWN_IN_SCENARIO); @@ -1265,7 +1261,6 @@ bool AfterLoadGame() } } } - Debug(net, 0, "AfterLoad state C {}", _random.state[0]); if (IsSavegameVersionBefore(SLV_42)) { for (auto t : Map::Iterate()) { @@ -1674,8 +1669,6 @@ bool AfterLoadGame() } } - Debug(net, 0, "AfterLoad state D {}", _random.state[0]); - if (IsSavegameVersionBefore(SLV_49)) { /* Perform conversion of very old face bits. */ for (Company *c : Company::Iterate()) { @@ -1692,17 +1685,13 @@ bool AfterLoadGame() auto style = FindCompanyManagerFaceLabel(c->face.style_label); if (style.has_value()) { SetCompanyManagerFaceStyle(c->face, *style); - Debug(misc, 0, "SET style = {}", c->face.style_label); } else { /* Style no longer exists, pick an entirely new face. */ RandomiseCompanyManagerFace(c->face, _random); - Debug(misc, 0, "DANGER RANDOM CALL for style = {}", c->face.style_label); } } } - Debug(net, 0, "AfterLoad state D3 {}", _random.state[0]); - if (IsSavegameVersionBefore(SLV_52)) { for (auto t : Map::Iterate()) { if (IsTileType(t, MP_OBJECT) && t.m5() == OBJECT_STATUE) { @@ -2539,7 +2528,6 @@ bool AfterLoadGame() } } } - Debug(net, 0, "AfterLoad state E {}", _random.state[0]); /* Oilrig was moved from id 15 to 9. */ if (IsSavegameVersionBefore(SLV_139)) { @@ -3076,7 +3064,6 @@ bool AfterLoadGame() } /* Beyond this point, tile types which can be accessed by vehicles must be in a valid state. */ - Debug(net, 0, "AfterLoad state EE {}", _random.state[0]); /* Update all vehicles: Phase 2 */ AfterLoadVehiclesPhase2(true); @@ -3374,7 +3361,6 @@ bool AfterLoadGame() if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile, false); } } - Debug(net, 0, "AfterLoad state F {}", _random.state[0]); /* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */ Station::RecomputeCatchmentForAll(); @@ -3489,8 +3475,6 @@ bool AfterLoadGame() } } - Debug(net, 0, "State after AfterLoad {}", _random.state[0]); - return true; } diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 171bd10b91..c5821d8f61 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -2309,10 +2309,6 @@ static void SlLoadChunks() if (ch == nullptr) SlErrorCorrupt("Unknown chunk type"); SlLoadChunk(*ch); } - Debug(misc, 0, - "SlLoadChunks date {} / {}, state {}, version {}-{}", - TimerGameCalendar::date, TimerGameCalendar::date_fract, - _random.state[0], _sl_version, _sl_minor_version); } /** Load all chunks for savegame checking */