summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2016-09-04 12:46:07 +0000
committeralberth <alberth@openttd.org>2016-09-04 12:46:07 +0000
commit087ed1e999e900d695f5de11b340406890baa3a7 (patch)
treea5354afbbc3b64d4d8f4e3f16ba29046d6c08cad
parent9135f7130ec5d542ec5187d10eb41920ade4d0c2 (diff)
downloadopenttd-087ed1e999e900d695f5de11b340406890baa3a7.tar.xz
(svn r27636) -Codechange: Rename FileType to AbstractFileType.
-rw-r--r--src/fileio_type.h8
-rw-r--r--src/fios_gui.cpp2
-rw-r--r--src/saveload/saveload.h16
3 files changed, 13 insertions, 13 deletions
diff --git a/src/fileio_type.h b/src/fileio_type.h
index 87cb2d1a8..fc50484f2 100644
--- a/src/fileio_type.h
+++ b/src/fileio_type.h
@@ -14,6 +14,14 @@
#include "core/enum_type.hpp"
+/** The different abstract types of files that the system knows about. */
+enum AbstractFileType {
+ FT_NONE, ///< nothing to do
+ FT_SAVEGAME, ///< old or new savegame
+ FT_SCENARIO, ///< old or new scenario
+ FT_HEIGHTMAP, ///< heightmap file
+};
+
/**
* The different kinds of subdirectories OpenTTD uses
*/
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index 401cb8254..31f0b3d51 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -738,7 +738,7 @@ static WindowDesc _save_dialog_desc(
* These values are used to convert the file/operations mode into a corresponding file type.
* So each entry, as expressed by the related comment, is based on the enum
*/
-static const FileType _file_modetotype[] = {
+static const AbstractFileType _file_modetotype[] = {
FT_SAVEGAME, // used for SLD_LOAD_GAME
FT_SCENARIO, // used for SLD_LOAD_SCENARIO
FT_SAVEGAME, // used for SLD_SAVE_GAME
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index c4472237c..450fe58fe 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -33,20 +33,12 @@ enum SaveOrLoadMode {
SL_LOAD_CHECK = 5, ///< Load for game preview.
};
-/** The different types of files that the system knows about. */
-enum FileType {
- FT_NONE, ///< nothing to do
- FT_SAVEGAME, ///< old or new savegame
- FT_SCENARIO, ///< old or new scenario
- FT_HEIGHTMAP, ///< heightmap file
-};
-
/** Deals with the type of the savegame, independent of extension */
struct FileToSaveLoad {
- SaveOrLoadMode mode; ///< savegame/scenario type (old, new)
- FileType filetype; ///< what type of file are we dealing with
- char name[MAX_PATH]; ///< name
- char title[255]; ///< internal name of the game
+ SaveOrLoadMode mode; ///< savegame/scenario type (old, new)
+ AbstractFileType filetype; ///< what type of file are we dealing with
+ char name[MAX_PATH]; ///< name
+ char title[255]; ///< internal name of the game
};
/** Types of save games. */