diff src/misc.cpp @ 6231:a4e11dd2d7c6 draft

(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have a symbol called _pause (and therefor our variable conflicts with thatone. We shouldn't be using _ as global indicator.....)
author truelight <truelight@openttd.org>
date Tue, 06 Mar 2007 20:59:52 +0000 (2007-03-06)
parents 3b141366478a
children 57363e064324
line wrap: on
line diff
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -104,7 +104,7 @@
 
 	SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, 0, WC_MAIN_WINDOW, 0);
 
-	_pause = 0;
+	_pause_game = 0;
 	_fast_forward = 0;
 	_tick_counter = 0;
 	_date_fract = 0;
@@ -307,7 +307,7 @@
 	    SLEG_VAR(_cur_player_tick_index,  SLE_FILE_U8  | SLE_VAR_U32),
 	    SLEG_VAR(_next_competitor_start,  SLE_FILE_U16 | SLE_VAR_U32),
 	    SLEG_VAR(_trees_tick_ctr,         SLE_UINT8),
-	SLEG_CONDVAR(_pause,                  SLE_UINT8,                   4, SL_MAX_VERSION),
+	SLEG_CONDVAR(_pause_game,             SLE_UINT8,                   4, SL_MAX_VERSION),
 	SLEG_CONDVAR(_cur_town_iter,          SLE_UINT32,                 11, SL_MAX_VERSION),
 	    SLEG_END()
 };