From 01c9b86896408d5b9c03920ac876dc7d88646d27 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sat, 4 Feb 2023 01:15:32 +0400
Subject: [PATCH] Fix cmstep console command

---
 src/citymania/cm_console_cmds.cpp | 3 ++-
 src/gfx.cpp                       | 2 +-
 src/misc.cpp                      | 2 +-
 src/misc_cmd.cpp                  | 1 -
 src/network/network.cpp           | 2 +-
 src/openttd.cpp                   | 4 ++--
 src/openttd.h                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/citymania/cm_console_cmds.cpp b/src/citymania/cm_console_cmds.cpp
index b311054e69..9e1b0ca671 100644
--- a/src/citymania/cm_console_cmds.cpp
+++ b/src/citymania/cm_console_cmds.cpp
@@ -31,6 +31,7 @@ uint32 _replay_save_interval = 0;
 uint32 _replay_last_save = 0;
 uint32 _replay_ticks = 0;
 bool _replay_started = false;
+extern uint32 _pause_countdown;
 
 static void IConsoleHelp(const char *str)
 {
@@ -54,7 +55,7 @@ bool ConStep(byte argc, char *argv[]) {
     }
     auto n = (argc > 1 ? atoi(argv[1]) : 1);
 
-    // FIXME (n << 1)
+    _pause_countdown = n;
     cmd::Pause(PM_PAUSED_NORMAL, 0).post();
 
     return true;
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 921ccd187d..2c2dceb517 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -51,7 +51,7 @@ std::atomic<bool> _exit_game;
 GameMode _game_mode;
 SwitchMode _switch_mode;  ///< The next mainloop command.
 PauseMode _pause_mode;
-uint32 _pause_countdown = 0;
+namespace citymania { uint32 _pause_countdown = 0; }
 Palette _cur_palette;
 
 static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
diff --git a/src/misc.cpp b/src/misc.cpp
index 2341f9e21e..64a76454bb 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -65,7 +65,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 
 	_pause_mode = PM_UNPAUSED;
 	_game_speed = 100;
-	_pause_countdown = 0;
+	citymania::_pause_countdown = 0;
 	_tick_counter = 0;
 	_cur_tileloop_tile = 1;
 	_thd.redsq = INVALID_TILE;
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 82e2835eed..a18504c1ef 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -171,7 +171,6 @@ CommandCost CmdPause(DoCommandFlag flags, PauseMode mode, bool pause)
 
 			if (pause) {
 				_pause_mode |= mode;
-				// FIXME //_pause_countdown = (p2 >> 1);
 			} else {
 				_pause_mode &= ~mode;
 			}
diff --git a/src/network/network.cpp b/src/network/network.cpp
index d3c97e6f13..0d871147e3 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1180,7 +1180,7 @@ void NetworkGameLoop()
 		}
 
 		NetworkExecuteLocalCommandQueue();
-		if (_pause_countdown > 0 && --_pause_countdown == 0) Command<CMD_PAUSE>::Post(PM_PAUSED_NORMAL, 1);
+		if (citymania::_pause_countdown > 0 && --citymania::_pause_countdown == 0) Command<CMD_PAUSE>::Post(PM_PAUSED_NORMAL, 1);
 
 		citymania::ExecuteFakeCommands(_date, _date_fract);
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 133ba71af1..53f1d97ee1 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -368,7 +368,7 @@ static void LoadIntroGame(bool load_newgrfs = true)
 
 	FixTitleGameZoom();
 	_pause_mode = PM_UNPAUSED;
-	_pause_countdown = 0;
+	citymania::_pause_countdown = 0;
 	_cursor.fix_at = false;
 
 	CheckForMissingGlyphs();
@@ -1445,7 +1445,7 @@ void StateGameLoop()
 		citymania::ExportFrameSprites();
 	}
 
-	if (_pause_countdown > 0 && --_pause_countdown == 0) {
+	if (citymania::_pause_countdown > 0 && --citymania::_pause_countdown == 0) {
 		_pause_mode = PM_PAUSED_NORMAL;
 		SetWindowDirty(WC_MAIN_TOOLBAR, 0);
 	}
diff --git a/src/openttd.h b/src/openttd.h
index c9a6e4c2b8..7055c5d62b 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -74,7 +74,7 @@ DECLARE_ENUM_AS_BIT_SET(PauseMode)
 
 /** The current pause mode */
 extern PauseMode _pause_mode;
-extern uint32 _pause_countdown;
+namespace citymania { extern uint32 _pause_countdown; }
 
 void AskExitGame();
 void AskExitToGameMenu();