--- a/console_cmds.c Thu Jul 21 22:22:26 2005 +0000
+++ b/console_cmds.c Fri Jul 22 06:31:31 2005 +0000
@@ -4,6 +4,7 @@
#include "debug.h"
#include "engine.h"
#include "functions.h"
+#include "saveload.h"
#include "string.h"
#include "variables.h"
#include "network_data.h"
--- a/functions.h Thu Jul 21 22:22:26 2005 +0000
+++ b/functions.h Fri Jul 22 06:31:31 2005 +0000
@@ -236,20 +236,6 @@
void ShowEndGameChart(void);
TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng);
-enum SaveOrLoadResult {
- SL_OK = 0, // completed successfully
- SL_ERROR = 1, // error that was caught before internal structures were modified
- SL_REINIT = 2, // error that was caught in the middle of updating game state, need to clear it. (can only happen during load)
-};
-enum SaveOrLoadMode {
- SL_INVALID = -1,
- SL_LOAD = 0,
- SL_SAVE = 1,
- SL_OLD_LOAD = 2,
-};
-
-int SaveOrLoad(const char *filename, int mode);
-
void AfterLoadTown(void);
void GenRandomNewGame(uint32 rnd1, uint32 rnd2);
void StartScenarioEditor(uint32 rnd1, uint32 rnd2);
--- a/misc_gui.c Thu Jul 21 22:22:26 2005 +0000
+++ b/misc_gui.c Fri Jul 22 06:31:31 2005 +0000
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "debug.h"
+#include "saveload.h"
#include "spritecache.h"
#include "strings.h"
#include "table/sprites.h"
--- a/network_client.c Thu Jul 21 22:22:26 2005 +0000
+++ b/network_client.c Fri Jul 22 06:31:31 2005 +0000
@@ -9,6 +9,7 @@
#include "table/strings.h"
#include "network_client.h"
#include "network_gamelist.h"
+#include "saveload.h"
#include "command.h"
#include "gfx.h"
#include "window.h"
--- a/network_server.c Thu Jul 21 22:22:26 2005 +0000
+++ b/network_server.c Fri Jul 22 06:31:31 2005 +0000
@@ -12,6 +12,7 @@
#include "console.h"
#include "command.h"
#include "gfx.h"
+#include "saveload.h"
#include "vehicle.h"
#include "station.h"
#include "settings.h"
--- a/openttd.c Thu Jul 21 22:22:26 2005 +0000
+++ b/openttd.c Fri Jul 22 06:31:31 2005 +0000
@@ -2,6 +2,7 @@
#include "string.h"
#include "table/strings.h"
#include "debug.h"
+#include "saveload.h"
#include "strings.h"
#include "map.h"
#include "tile.h"
--- a/saveload.c Thu Jul 21 22:22:26 2005 +0000
+++ b/saveload.c Fri Jul 22 06:31:31 2005 +0000
@@ -1196,7 +1196,7 @@
extern bool LoadOldSaveGame(const char *file);
/** Small helper function to close the to be loaded savegame an signal error */
-static inline int AbortSaveLoad(void)
+static inline SaveOrLoadResult AbortSaveLoad(void)
{
if (_sl.fh != NULL) fclose(_sl.fh);
@@ -1300,7 +1300,7 @@
* @param mode Save or load. Load can also be a TTD(Patch) game. Use SL_LOAD, SL_OLD_LOAD or SL_SAVE
* @return Return the results of the action. SL_OK, SL_ERROR or SL_REINIT ("unload" the game)
*/
-int SaveOrLoad(const char *filename, int mode)
+SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
{
uint32 hdr[2];
const SaveLoadFormat *fmt;
--- a/saveload.h Thu Jul 21 22:22:26 2005 +0000
+++ b/saveload.h Fri Jul 22 06:31:31 2005 +0000
@@ -3,6 +3,22 @@
#include <setjmp.h>
+typedef enum SaveOrLoadResult {
+ SL_OK = 0, // completed successfully
+ SL_ERROR = 1, // error that was caught before internal structures were modified
+ SL_REINIT = 2, // error that was caught in the middle of updating game state, need to clear it. (can only happen during load)
+} SaveOrLoadResult;
+
+typedef enum SaveOrLoadMode {
+ SL_INVALID = -1,
+ SL_LOAD = 0,
+ SL_SAVE = 1,
+ SL_OLD_LOAD = 2,
+} SaveOrLoadMode;
+
+SaveOrLoadResult SaveOrLoad(const char *filename, int mode);
+
+
typedef void ChunkSaveLoadProc(void);
typedef void AutolengthProc(void *arg);
--- a/win32.c Thu Jul 21 22:22:26 2005 +0000
+++ b/win32.c Fri Jul 22 06:31:31 2005 +0000
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "debug.h"
+#include "saveload.h"
#include "string.h"
#include "table/strings.h"
#include "gfx.h"