diff options
| author | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
| commit | 1fe3ad3288fd2198f5480f75a17b707cd2a3c2af (patch) | |
| tree | 89d8ada3dbf29005d4cf5ab88204c3b24dd97795 /src/saveload | |
| parent | 2fe966fd8c56a7cab7a4a9dd9485e0034e6cf7f0 (diff) | |
| download | openttd-1fe3ad3288fd2198f5480f75a17b707cd2a3c2af.tar.xz | |
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 6 | ||||
| -rw-r--r-- | src/saveload/saveload.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 6c82203dd..bf067409d 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -472,7 +472,7 @@ bool AfterLoadGame() /* Check if all NewGRFs are present, we are very strict in MP mode */ GRFListCompatibility gcf_res = IsGoodGRFConfigList(); if (_networking && gcf_res != GLC_ALL_GOOD) { - SetSaveLoadError(STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH); + SetSaveLoadError(STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH); /* Restore the signals */ ResetSignalHandlers(); return false; @@ -521,7 +521,7 @@ bool AfterLoadGame() /* make sure there is a town in the game */ if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) { - SetSaveLoadError(STR_NO_TOWN_IN_SCENARIO); + SetSaveLoadError(STR_ERROR_NO_TOWN_IN_SCENARIO); /* Restore the signals */ ResetSignalHandlers(); return false; @@ -1601,7 +1601,7 @@ bool AfterLoadGame() FOR_ALL_ROADVEHICLES(v) { if (v->First() == v && HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM)) { if (_switch_mode_errorstr == INVALID_STRING_ID || _switch_mode_errorstr == STR_NEWGRF_COMPATIBLE_LOAD_WARNING) { - _switch_mode_errorstr = STR_LOADGAME_REMOVED_TRAMS; + _switch_mode_errorstr = STR_WARNING_LOADGAME_REMOVED_TRAMS; } delete v; } diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index a541b2006..88be40d72 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -1783,7 +1783,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) /* 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(INVALID_STRING_ID, STR_SAVE_STILL_IN_PROGRESS, 0, 0); + if (!_do_autosave) ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_SAVE_STILL_IN_PROGRESS, 0, 0); return SL_OK; } WaitTillSaved(); @@ -1988,7 +1988,7 @@ void GenerateDefaultSaveName(char *buf, const char *last) SetDParam(2, _date); /* Get the correct string (special string for when there's not company) */ - GetString(buf, !Company::IsValidID(cid) ? STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME : STR_DEFAULT_SAVEGAME_NAME, last); + GetString(buf, !Company::IsValidID(cid) ? STR_SAVEGAME_NAME_SPECTATOR : STR_SAVEGAME_NAME_DEFAULT, last); SanitizeFilename(buf); } |