summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-22 23:08:32 +0000
committerrubidium <rubidium@openttd.org>2011-01-22 23:08:32 +0000
commitd74fc0bee3fa3d9c5eb0308bc8cd12a7a3d2cb23 (patch)
treeb34470086dae808eb3037fd4c133436fbada3129
parent7eadf07e44d5f6afe097fc77beee4170c270b93c (diff)
downloadopenttd-d74fc0bee3fa3d9c5eb0308bc8cd12a7a3d2cb23.tar.xz
(svn r21895) -Cleanup: get rid of the unused SLD_NEW_GAME
-rw-r--r--src/fios.cpp8
-rw-r--r--src/fios.h1
-rw-r--r--src/fios_gui.cpp2
3 files changed, 4 insertions, 7 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index bdb56e50f..8dbb1fae8 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -279,7 +279,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
_fios_items.Clear();
/* A parent directory link exists if we are not in the root directory */
- if (!FiosIsRoot(_fios_path) && mode != SLD_NEW_GAME) {
+ if (!FiosIsRoot(_fios_path)) {
fios = _fios_items.Append();
fios->type = FIOS_TYPE_PARENT;
fios->mtime = 0;
@@ -288,7 +288,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
}
/* Show subdirectories */
- if (mode != SLD_NEW_GAME && (dir = ttd_opendir(_fios_path)) != NULL) {
+ if ((dir = ttd_opendir(_fios_path)) != NULL) {
while ((dirent = readdir(dir)) != NULL) {
strecpy(d_name, FS2OTTD(dirent->d_name), lastof(d_name));
@@ -329,7 +329,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
QSortT(_fios_items.Get(sort_start), _fios_items.Length() - sort_start, CompareFiosItems);
/* Show drives */
- if (mode != SLD_NEW_GAME) FiosGetDrives();
+ FiosGetDrives();
_fios_items.Compact();
}
@@ -433,7 +433,7 @@ static FiosType FiosGetScenarioListCallback(SaveLoadDialogMode mode, const char
return FIOS_TYPE_SCENARIO;
}
- if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO || mode == SLD_NEW_GAME) {
+ if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
if (strcasecmp(ext, ".sv0") == 0 || strcasecmp(ext, ".ss0") == 0 ) {
GetOldSaveGameName(file, title, last);
return FIOS_TYPE_OLD_SCENARIO;
diff --git a/src/fios.h b/src/fios.h
index 720da6765..6abef9bb3 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -98,7 +98,6 @@ enum SaveLoadDialogMode {
SLD_SAVE_GAME,
SLD_SAVE_SCENARIO,
SLD_LOAD_HEIGHTMAP,
- SLD_NEW_GAME,
};
/* The different types of files been handled by the system */
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index e1a5df5ae..c9bc284f5 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -203,7 +203,6 @@ void BuildFileList()
FiosFreeSavegameList();
switch (_saveload_mode) {
- case SLD_NEW_GAME:
case SLD_LOAD_SCENARIO:
case SLD_SAVE_SCENARIO:
FiosGetScenarioList(_saveload_mode); break;
@@ -716,7 +715,6 @@ static const FileType _file_modetotype[] = {
FT_SAVEGAME, ///< used for SLD_SAVE_GAME
FT_SCENARIO, ///< used for SLD_SAVE_SCENARIO
FT_HEIGHTMAP, ///< used for SLD_LOAD_HEIGHTMAP
- FT_SAVEGAME, ///< SLD_NEW_GAME
};
void ShowSaveLoadDialog(SaveLoadDialogMode mode)