(svn r3294) - Fix: use INVALID_STRING_ID instead of -1.

- Fix: savegames only give back one message, show this by ignoring the first argument. Perhaps make the message more verbose in the future by adding STR_ equivalents next to the already existing debug messages.

6 files changed, 11 insertions, 13 deletions

diff --git a/ai/trolly/trolly.c b/ai/trolly/trolly.c
index a2a0f8a35..20aa3594c 100644
--- a/ai/trolly/trolly.c
+++ b/ai/trolly/trolly.c
@@ -45,7 +45,7 @@ static void AiNew_State_FirstTime(Player *p)
 	// We first have to init some things
 
 	if (_current_player == 1 || _ai.network_client) {
-		ShowErrorMessage(-1, TEMP_AI_IN_PROGRESS, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, TEMP_AI_IN_PROGRESS, 0, 0);
 	}
 
 	// The PathFinder (AyStar)
diff --git a/command.c b/command.c
index 5b32156a8..981677f35 100644
--- a/command.c
+++ b/command.c
@@ -340,9 +340,7 @@ int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc)
 
 	proc = _command_proc_table[procc].proc;
 
-	if (_docommand_recursive == 0) {
-		_error_message = INVALID_STRING_ID;
-	}
+	if (_docommand_recursive == 0) _error_message = INVALID_STRING_ID;
 
 	_docommand_recursive++;
 
diff --git a/intro_gui.c b/intro_gui.c
index 8f8031995..e67c80b8b 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -88,11 +88,11 @@ static void SelectGameWndProc(Window *w, WindowEvent *e)
 		case 15:
 #ifdef ENABLE_NETWORK
 			if (!_network_available) {
-				ShowErrorMessage(-1, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+				ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
 			} else
 				ShowNetworkGameWindow();
 #else
-			ShowErrorMessage(-1 ,STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+			ShowErrorMessage(INVALID_STRING_ID ,STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
 #endif
 			break;
 		case 16: ShowGameOptions(); break;
diff --git a/openttd.c b/openttd.c
index 6330765ef..bfd0df97c 100644
--- a/openttd.c
+++ b/openttd.c
@@ -676,7 +676,7 @@ static void StartScenario(void)
 	// invalid type
 	if (_file_to_saveload.mode == SL_INVALID) {
 		printf("Savegame is obsolete or invalid format: %s\n", _file_to_saveload.name);
-		ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		_game_mode = GM_MENU;
 		return;
 	}
@@ -692,7 +692,7 @@ static void StartScenario(void)
 	// Load game
 	if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode) != SL_OK) {
 		LoadIntroGame();
-		ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 	}
 
 	_opt_ptr = &_opt;
@@ -788,7 +788,7 @@ void SwitchMode(int new_mode)
 
 		if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) {
 			LoadIntroGame();
-			ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);
+			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		} else {
 			_local_player = 0;
 			DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
diff --git a/saveload.c b/saveload.c
index 8cfc878bb..55d987df0 100644
--- a/saveload.c
+++ b/saveload.c
@@ -1356,7 +1356,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
 	/* An instance of saving is already active, so don't go saving again */
 	if (_ts.saveinprogress && mode == SL_SAVE) {
 		// if not an autosave, but a user action, show error message
-		if (!_do_autosave) ShowErrorMessage(_error_message, STR_SAVE_STILL_IN_PROGRESS, 0, 0);
+		if (!_do_autosave) ShowErrorMessage(INVALID_STRING_ID, STR_SAVE_STILL_IN_PROGRESS, 0, 0);
 		return SL_OK;
 	}
 	WaitTillSaved();
diff --git a/settings_gui.c b/settings_gui.c
index 1c6dd1cbb..319d1a5c8 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -562,13 +562,13 @@ static int32 v_PositionMainToolbar(int32 p1)
 
 static int32 AiNew_PatchActive_Warning(int32 p1)
 {
-	if (p1 == 1) ShowErrorMessage(-1, TEMP_AI_ACTIVATED, 0, 0);
+	if (p1 == 1) ShowErrorMessage(INVALID_STRING_ID, TEMP_AI_ACTIVATED, 0, 0);
 	return 0;
 }
 
 static int32 Ai_In_Multiplayer_Warning(int32 p1)
 {
-	if (p1 == 1) ShowErrorMessage(-1, TEMP_AI_MULTIPLAYER, 0, 0);
+	if (p1 == 1) ShowErrorMessage(INVALID_STRING_ID, TEMP_AI_MULTIPLAYER, 0, 0);
 	return 0;
 }
 
@@ -617,7 +617,7 @@ static int32 CheckInterval(int32 p1)
 	}
 
 	if (!warning)
-		ShowErrorMessage(-1, STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE, 0, 0);
 
 	return InValidateDetailsWindow(0);
 }