src/misc.cpp
branchgamebalance
changeset 9895 7bd07f43b0e3
parent 9881 fbb3eab0e186
child 9896 2473804114de
--- a/src/misc.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/misc.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -30,7 +30,7 @@
 #include "network/network_data.h"
 uint32 DoRandom(int line, const char *file)
 #else // RANDOM_DEBUG
-uint32 Random(void)
+uint32 Random()
 #endif // RANDOM_DEBUG
 {
 
@@ -62,7 +62,7 @@
 #endif
 
 
-uint32 InteractiveRandom(void)
+uint32 InteractiveRandom()
 {
 	uint32 t = _random_seeds[1][1];
 	uint32 s = _random_seeds[1][0];
@@ -75,27 +75,27 @@
 	return GB(InteractiveRandom(), 0, 16) * max >> 16;
 }
 
-void InitializeVehicles(void);
-void InitializeWaypoints(void);
-void InitializeDepots(void);
-void InitializeEngines(void);
-void InitializeOrders(void);
-void InitializeClearLand(void);
-void InitializeRailGui(void);
-void InitializeRoadGui(void);
-void InitializeAirportGui(void);
-void InitializeDockGui(void);
-void InitializeIndustries(void);
-void InitializeMainGui(void);
-void InitializeLandscape(void);
-void InitializeTowns(void);
-void InitializeTrees(void);
-void InitializeSigns(void);
-void InitializeStations(void);
-static void InitializeNameMgr(void);
-void InitializePlayers(void);
-static void InitializeCheats(void);
-void InitializeNPF(void);
+void InitializeVehicles();
+void InitializeWaypoints();
+void InitializeDepots();
+void InitializeEngines();
+void InitializeOrders();
+void InitializeClearLand();
+void InitializeRailGui();
+void InitializeRoadGui();
+void InitializeAirportGui();
+void InitializeDockGui();
+void InitializeIndustries();
+void InitializeMainGui();
+void InitializeLandscape();
+void InitializeTowns();
+void InitializeTrees();
+void InitializeSigns();
+void InitializeStations();
+static void InitializeNameMgr();
+void InitializePlayers();
+static void InitializeCheats();
+void InitializeNPF();
 
 void InitializeGame(int mode, uint size_x, uint size_y)
 {
@@ -105,7 +105,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;
@@ -172,13 +172,13 @@
 }
 
 
-static void InitializeCheats(void)
+static void InitializeCheats()
 {
 	memset(&_cheats, 0, sizeof(Cheats));
 }
 
 
-static void InitializeNameMgr(void)
+static void InitializeNameMgr()
 {
 	memset(_name_array, 0, sizeof(_name_array));
 }
@@ -206,7 +206,7 @@
 	}
 }
 
-void ConvertNameArray(void)
+void ConvertNameArray()
 {
 	uint i;
 
@@ -269,7 +269,7 @@
 }
 
 
-static void Save_NAME(void)
+static void Save_NAME()
 {
 	int i;
 
@@ -281,7 +281,7 @@
 	}
 }
 
-static void Load_NAME(void)
+static void Load_NAME()
 {
 	int index;
 
@@ -309,14 +309,14 @@
 	    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()
 };
 
 /* Save load date related variables as well as persistent tick counters
  * XXX: currently some unrelated stuff is just put here */
-static void SaveLoad_DATE(void)
+static void SaveLoad_DATE()
 {
 	SlGlobList(_date_desc);
 }
@@ -331,7 +331,7 @@
 	    SLEG_END()
 };
 
-static void SaveLoad_VIEW(void)
+static void SaveLoad_VIEW()
 {
 	SlGlobList(_view_desc);
 }
@@ -345,20 +345,20 @@
 	    SLEG_END()
 };
 
-static void Save_MAPS(void)
+static void Save_MAPS()
 {
 	_map_dim_x = MapSizeX();
 	_map_dim_y = MapSizeY();
 	SlGlobList(_map_dimensions);
 }
 
-static void Load_MAPS(void)
+static void Load_MAPS()
 {
 	SlGlobList(_map_dimensions);
 	AllocateMap(_map_dim_x, _map_dim_y);
 }
 
-static void Load_MAPT(void)
+static void Load_MAPT()
 {
 	uint size = MapSize();
 	uint i;
@@ -372,7 +372,7 @@
 	}
 }
 
-static void Save_MAPT(void)
+static void Save_MAPT()
 {
 	uint size = MapSize();
 	uint i;
@@ -387,7 +387,7 @@
 	}
 }
 
-static void Load_MAP1(void)
+static void Load_MAP1()
 {
 	uint size = MapSize();
 	uint i;
@@ -401,7 +401,7 @@
 	}
 }
 
-static void Save_MAP1(void)
+static void Save_MAP1()
 {
 	uint size = MapSize();
 	uint i;
@@ -416,7 +416,7 @@
 	}
 }
 
-static void Load_MAP2(void)
+static void Load_MAP2()
 {
 	uint size = MapSize();
 	uint i;
@@ -433,7 +433,7 @@
 	}
 }
 
-static void Save_MAP2(void)
+static void Save_MAP2()
 {
 	uint size = MapSize();
 	uint i;
@@ -448,7 +448,7 @@
 	}
 }
 
-static void Load_MAP3(void)
+static void Load_MAP3()
 {
 	uint size = MapSize();
 	uint i;
@@ -462,7 +462,7 @@
 	}
 }
 
-static void Save_MAP3(void)
+static void Save_MAP3()
 {
 	uint size = MapSize();
 	uint i;
@@ -477,7 +477,7 @@
 	}
 }
 
-static void Load_MAP4(void)
+static void Load_MAP4()
 {
 	uint size = MapSize();
 	uint i;
@@ -491,7 +491,7 @@
 	}
 }
 
-static void Save_MAP4(void)
+static void Save_MAP4()
 {
 	uint size = MapSize();
 	uint i;
@@ -506,7 +506,7 @@
 	}
 }
 
-static void Load_MAP5(void)
+static void Load_MAP5()
 {
 	uint size = MapSize();
 	uint i;
@@ -520,7 +520,7 @@
 	}
 }
 
-static void Save_MAP5(void)
+static void Save_MAP5()
 {
 	uint size = MapSize();
 	uint i;
@@ -535,7 +535,7 @@
 	}
 }
 
-static void Load_MAP6(void)
+static void Load_MAP6()
 {
 	/* Still available for loading old games */
 	uint size = MapSize();
@@ -565,7 +565,7 @@
 	}
 }
 
-static void Save_MAP6(void)
+static void Save_MAP6()
 {
 	uint size = MapSize();
 	uint i;
@@ -581,7 +581,7 @@
 }
 
 
-static void Save_CHTS(void)
+static void Save_CHTS()
 {
 	byte count = sizeof(_cheats)/sizeof(Cheat);
 	Cheat* cht = (Cheat*) &_cheats;
@@ -594,7 +594,7 @@
 	}
 }
 
-static void Load_CHTS(void)
+static void Load_CHTS()
 {
 	Cheat* cht = (Cheat*)&_cheats;
 	uint count = SlGetFieldLength() / 2;