Mercurial > hg > openttd
changeset 8151:bee108a98a39 draft
(svn r11713) -Codechange: Move some declarations and definitions in a more logical disposition
| author | belugas <belugas@openttd.org> |
|---|---|
| date | Fri, 28 Dec 2007 03:14:55 +0000 |
| parents | e31c5899f5aa |
| children | 32bfb56e7e0e |
| files | src/fios.cpp src/fios.h src/genworld_gui.cpp src/heightmap.cpp src/landscape.cpp src/openttd.cpp src/variables.h src/video/dedicated_v.cpp |
| diffstat | 8 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fios.cpp +++ b/src/fios.cpp @@ -29,6 +29,7 @@ static char *_fios_path; static FiosItem *_fios_items; +SmallFiosItem _file_to_saveload; static int _fios_count, _fios_alloc; /* OS-specific functions are taken from their respective files (win32/unix/os2 .c) */
--- a/src/fios.h +++ b/src/fios.h @@ -23,14 +23,6 @@ MAX_FILE_SLOTS = 64 }; -/* Deals with finding savegames */ -struct FiosItem { - byte type; - uint64 mtime; - char title[64]; - char name[256 - 12 - 64]; -}; - enum SaveLoadDialogMode{ SLD_LOAD_GAME, SLD_LOAD_SCENARIO, @@ -54,9 +46,25 @@ FIOS_TYPE_INVALID = 255, }; +/* Deals with finding savegames */ +struct FiosItem { + byte type; + uint64 mtime; + char title[64]; + char name[256 - 12 - 64]; +}; + +/* Deals with the type of the savegame, independent of extension */ +struct SmallFiosItem { + int mode; ///< savegame/scenario type (old, new) + char name[MAX_PATH]; ///< name + char title[255]; ///< internal name of the game +}; + /* Variables to display file lists */ extern FiosItem *_fios_list; ///< defined in misc_gui.cpp extern int _fios_num; ///< defined in fios.cpp, read_only version of _fios_count +extern SmallFiosItem _file_to_saveload; extern SaveLoadDialogMode _saveload_mode; ///< defined in misc_gui.cpp /* Launch save/load dialog */
--- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -25,6 +25,7 @@ #include "strings_func.h" #include "window_func.h" #include "date_func.h" +#include "fios.h" /** * In what 'mode' the GenerateLandscapeWindowProc is.
--- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -15,6 +15,7 @@ #include "bmp.h" #include "gfx_func.h" #include "core/alloc_func.hpp" +#include "fios.h" /** * Convert RGB colors to Grayscale using 29.9% Red, 58.7% Green, 11.4% Blue
--- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -19,7 +19,7 @@ #include "genworld.h" #include "tile_cmd.h" #include "core/alloc_func.hpp" -#include "functions.h" +#include "fios.h" #include "window_func.h" #include "functions.h" #include "date_func.h"
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -32,6 +32,7 @@ #include "engine.h" #include "sound.h" #include "fileio.h" +#include "fios.h" #include "airport.h" #include "aircraft.h" #include "console.h"
--- a/src/variables.h +++ b/src/variables.h @@ -297,17 +297,9 @@ VARDEF TileIndex _build_tunnel_endtile; VARDEF bool _generating_world; -/* Deals with the type of the savegame, independent of extension */ -struct SmallFiosItem { - int mode; // savegame/scenario type (old, new) - char name[MAX_PATH]; // name - char title[255]; // internal name of the game -}; - /* Used when switching from the intro menu. */ VARDEF byte _switch_mode; VARDEF StringID _switch_mode_errorstr; -VARDEF SmallFiosItem _file_to_saveload; VARDEF char _ini_videodriver[32], _ini_musicdriver[32], _ini_sounddriver[32], _ini_blitter[32];