src/console_cmds.cpp
branchgamebalance
changeset 9895 7bd07f43b0e3
parent 6449 e520244dc71e
child 6307 f40e88cff863
--- a/src/console_cmds.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/console_cmds.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -32,7 +32,7 @@
 
 // ** console command / variable defines ** //
 #define DEF_CONSOLE_CMD(function) static bool function(byte argc, char *argv[])
-#define DEF_CONSOLE_HOOK(function) static bool function(void)
+#define DEF_CONSOLE_HOOK(function) static bool function()
 
 
 /* **************************** */
@@ -41,7 +41,7 @@
 
 #ifdef ENABLE_NETWORK
 
-static inline bool NetworkAvailable(void)
+static inline bool NetworkAvailable()
 {
 	if (!_network_available) {
 		IConsoleError("You cannot use this command because there is no network available.");
@@ -141,7 +141,7 @@
 	FOR_ALL_VEHICLES(v) {
 		/* Code ripped from CmdStartStopTrain. Can't call it, because of
 		 * ownership problems, so we'll duplicate some code, for now */
-		if (v->type == VEH_Train)
+		if (v->type == VEH_TRAIN)
 			v->u.rail.days_since_order_progr = 0;
 		v->vehstatus |= VS_STOPPED;
 		InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
@@ -175,7 +175,7 @@
 }
 
 extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm);
-extern void BuildFileList(void);
+extern void BuildFileList();
 extern void SetFiosType(const byte fiostype);
 
 /* Save the map to a file */
@@ -499,7 +499,7 @@
 		return true;
 	}
 
-	if (_pause == 0) {
+	if (_pause_game == 0) {
 		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
 		IConsolePrint(_icolour_def, "Game paused.");
 	} else {
@@ -516,7 +516,7 @@
 		return true;
 	}
 
-	if (_pause != 0) {
+	if (_pause_game != 0) {
 		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
 		IConsolePrint(_icolour_def, "Game unpaused.");
 	} else {
@@ -544,6 +544,7 @@
 {
 	static const char* const stat_str[] = {
 		"inactive",
+		"authorizing",
 		"authorized",
 		"waiting",
 		"loading map",
@@ -852,7 +853,7 @@
 /* **************************** */
 /*   default console commands   */
 /* **************************** */
-extern bool CloseConsoleLogIfActive(void);
+extern bool CloseConsoleLogIfActive();
 
 DEF_CONSOLE_CMD(ConScript)
 {
@@ -1441,7 +1442,7 @@
 /*  debug commands and variables */
 /* ****************************************** */
 
-static void IConsoleDebugLibRegister(void)
+static void IConsoleDebugLibRegister()
 {
 	/* debugging variables and functions */
 	extern bool _stdlib_con_developer; // XXX extern in .cpp
@@ -1458,7 +1459,7 @@
 /*  console command and variable registration */
 /* ****************************************** */
 
-void IConsoleStdLibRegister(void)
+void IConsoleStdLibRegister()
 {
 	/* stdlib */
 	extern byte _stdlib_developer; // XXX extern in .cpp