(svn r2828) Only command.c needs to know about _docommand_recursive, so make it static. Tell me if there's a problem, because i removed it from network_server.c, but afaict it should be ok

19 years ago · 2c96a3dce9
parent 1ec4c29c0d
commit 2c96a3dce9
3 changed files with 2 additions and 4 deletions
--- a/command.c
+++ b/command.c
@ -325,6 +325,8 @@ int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint p
 }


+static int _docommand_recursive;
+
 int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc)
 {
 	int32 res;
--- a/network_server.c
+++ b/network_server.c
@ -1353,8 +1353,6 @@ extern void SwitchMode(int new_mode);
 static void NetworkCheckRestartMap(void)
 {
 	if (_network_restart_game_date != 0 && _cur_year + MAX_YEAR_BEGIN_REAL >= _network_restart_game_date) {
-		_docommand_recursive = 0;
-
 		DEBUG(net, 0)("Auto-restarting map. Year %d reached.", _cur_year + MAX_YEAR_BEGIN_REAL);

 		_random_seeds[0][0] = Random();
--- a/variables.h
+++ b/variables.h
@ -271,8 +271,6 @@ VARDEF int32 _additional_cash_required;

 VARDEF uint32 _decode_parameters[20];

-VARDEF int _docommand_recursive;
-
 VARDEF uint32 _pressed_key; // Low 8 bits = ASCII, High 16 bits = keycode
 VARDEF bool _ctrl_pressed;  // Is Ctrl pressed?
 VARDEF bool _shift_pressed;  // Is Alt pressed?