summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-08-07 10:03:14 +0000
committertron <tron@openttd.org>2005-08-07 10:03:14 +0000
commit2b4e85db0b1f801d9f8af00f9e0f879ba493515c (patch)
treeef39c18d00bd3284668793774053ec519726da06
parentdc20e0ae81fe9d7e2d810d8974e8a8e14135a9e4 (diff)
downloadopenttd-2b4e85db0b1f801d9f8af00f9e0f879ba493515c.tar.xz
(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
-rw-r--r--command.c2
-rw-r--r--network_server.c2
-rw-r--r--variables.h2
3 files changed, 2 insertions, 4 deletions
diff --git a/command.c b/command.c
index c31985c7a..627b8e9c5 100644
--- 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;
diff --git a/network_server.c b/network_server.c
index d53f7d575..3af33e022 100644
--- 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();
diff --git a/variables.h b/variables.h
index fc797b77b..c7290e146 100644
--- 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?