cpp/openttd-patchpack/source Changeset - r6935:a7744b917c21

Changeset - r6935:a7744b917c21

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 17 years ago 2007-06-17 20:09:05
rubidium@openttd.org

(svn r10188) -Codechange: make it a little easier to load a savegame from the console:
-g <absolute path>
-g <relative path from current working directory>
-g <relative path from within the savegame directory>

4 files changed with 12 insertions and 6 deletions:

src/fileio.cpp

src/fileio.h

src/openttd.cpp

src/saveload.cpp

0 comments (0 inline, 0 general)

src/fileio.cpp

➞

Show inline comments

@@ @@ -270,51 +270,51 @@ FILE *FioFOpenFileSp(const char *filenam @@
+{
 #if defined(WIN32) && defined(UNICODE)
 	/* fopen is implemented as a define with ellipses for
 	 * Unicode support (prepend an L). As we are not sending
 	 * a string, but a variable, it 'renames' the variable,
 	 * so make that variable to makes it compile happily */
 	wchar_t Lmode[5];
 	MultiByteToWideChar(CP_ACP, 0, mode, -1, Lmode, lengthof(Lmode));
 #endif
 	FILE *f = NULL;
 	char buf[MAX_PATH];
-	if (subdir == BASE_DIR) {
+	if (subdir == NO_DIRECTORY) {
 		ttd_strlcpy(buf, filename, lengthof(buf));
 	} else {
 		snprintf(buf, lengthof(buf), "%s%s%s", _searchpaths[sp], _subdirs[subdir], filename);
+	}
 	f = fopen(buf, mode);
 #if !defined(WIN32)
 	if (f == NULL) {
 		strtolower(buf + strlen(_searchpaths[sp]) - 1);
 		f = fopen(buf, mode);
+	}
 #endif
 	return f;
+}
 /** Opens OpenTTD files somewhere in a personal or global directory */
 FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir)
+{
 	FILE *f = NULL;
 	Searchpath sp;
 	assert(subdir < NUM_SUBDIRS);
+	assert(subdir < NUM_SUBDIRS || subdir == NO_DIRECTORY);
 	FOR_ALL_SEARCHPATHS(sp) {
 		f = FioFOpenFileSp(filename, mode, sp, subdir);
-		if (f != NULL || subdir == 0) break;
+		if (f != NULL || subdir == NO_DIRECTORY) break;
+	}
 	return f;
+}
 /**
  * Create a directory with the given name
  * @param name the new name of the directory
  */
 void FioCreateDirectory(const char *name)
+{
 #if defined(WIN32) || defined(WINCE)

src/fileio.h

➞

Show inline comments

@@ @@ -24,24 +24,25 @@ void FioCreateDirectory(const char *file @@
  * The different kinds of subdirectories OpenTTD uses
  */
 enum Subdirectory {
 	BASE_DIR,      ///< Base directory for all subdirectories
 	SAVE_DIR,      ///< Base directory for all savegames
 	AUTOSAVE_DIR,  ///< Subdirectory of save for autosaves
 	SCENARIO_DIR,  ///< Base directory for all scenarios
 	HEIGHTMAP_DIR, ///< Subdirectory of scenario for heightmaps
 	GM_DIR,        ///< Subdirectory for all music
 	DATA_DIR,      ///< Subdirectory for all data (GRFs, sample.cat, intro game)
 	LANG_DIR,      ///< Subdirectory for all translation files
 	NUM_SUBDIRS,   ///< Number of subdirectories
 	NO_DIRECTORY,  ///< A path without any base directory
 };
 /**
  * Types of searchpaths OpenTTD might use
  */
 enum Searchpath {
 	SP_PERSONAL_DIR,           ///< Search in the personal directory
 	SP_SHARED_DIR,             ///< Search in the shared directory, like 'Shared Files' under Windows
 	SP_WORKING_DIR,            ///< Search in the working directory
 	SP_BINARY_DIR,             ///< Search in the directory where the binary resides
 	SP_INSTALLATION_DIR,       ///< Search in the installation directory
 	SP_APPLICATION_BUNDLE_DIR, ///< Search within the application bundle

src/openttd.cpp

➞

Show inline comments

@@ @@ -851,25 +851,25 @@ void SwitchMode(int new_mode) @@
 #ifdef ENABLE_NETWORK
 		if (_network_server) {
 			snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded scenario)", _file_to_saveload.title);
+		}
 #endif /* ENABLE_NETWORK */
 		StartScenario();
 		break;
 	case SM_LOAD: { /* Load game, Play Scenario */
 		_opt_ptr = &_opt;
 		ResetGRFConfig(true);
-		if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, BASE_DIR)) {
+		if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) {
 			LoadIntroGame();
 			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		} else {
 			/* Update the local player for a loaded game. It is either always
 			 * player #1 (eg 0) or in the case of a dedicated server a spectator */
 			SetLocalPlayer(_network_dedicated ? PLAYER_SPECTATOR : PLAYER_FIRST);
 			DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title);
+			}
 #endif /* ENABLE_NETWORK */
@@ @@ -885,41 +885,41 @@ void SwitchMode(int new_mode) @@
 #endif /* ENABLE_NETWORK */
 		MakeNewGame(true);
 		break;
 	case SM_LOAD_HEIGHTMAP: /* Load heightmap from scenario editor */
 		SetLocalPlayer(OWNER_NONE);
 		GenerateWorld(GW_HEIGHTMAP, 1 << _patches.map_x, 1 << _patches.map_y);
 		MarkWholeScreenDirty();
 		break;
 	case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */
-		if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, BASE_DIR)) {
+		if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) {
 			_opt_ptr = &_opt;
 			SetLocalPlayer(OWNER_NONE);
 			_patches_newgame.starting_year = _cur_year;
 		} else {
 			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
+		}
 		break;
+	}
 	case SM_MENU: /* Switch to game intro menu */
 		LoadIntroGame();
 		break;
 	case SM_SAVE: /* Save game */
-		if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, BASE_DIR) != SL_OK) {
+		if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, NO_DIRECTORY) != SL_OK) {
 			ShowErrorMessage(INVALID_STRING_ID, STR_4007_GAME_SAVE_FAILED, 0, 0);
 		} else {
 			DeleteWindowById(WC_SAVELOAD, 0);
+		}
 		break;
 	case SM_GENRANDLAND: /* Generate random land within scenario editor */
 		SetLocalPlayer(OWNER_NONE);
 		GenerateWorld(GW_RANDOM, 1 << _patches.map_x, 1 << _patches.map_y);
 		/* XXX: set date */
 		MarkWholeScreenDirty();
 		break;

src/saveload.cpp

➞

Show inline comments

@@ @@ -1575,24 +1575,29 @@ SaveOrLoadResult SaveOrLoad(const char * @@
 	WaitTillSaved();
 	/* Load a TTDLX or TTDPatch game */
 	if (mode == SL_OLD_LOAD) {
 		InitializeGame(IG_DATE_RESET, 256, 256); // set a mapsize of 256x256 for TTDPatch games or it might get confused
 		if (!LoadOldSaveGame(filename)) return SL_REINIT;
 		_sl_version = 0;
 		AfterLoadGame();
 		return SL_OK;
+	}
 	_sl.fh = (mode == SL_SAVE) ? FioFOpenFile(filename, "wb", sb) : FioFOpenFile(filename, "rb", sb);
 	/* Make it a little easier to load savegames from the console */
 	if (_sl.fh == NULL && mode == SL_LOAD) _sl.fh = FioFOpenFile(filename, "rb", SAVE_DIR);
 	if (_sl.fh == NULL && mode == SL_LOAD) _sl.fh = FioFOpenFile(filename, "rb", BASE_DIR);
 	if (_sl.fh == NULL) {
 		DEBUG(sl, 0, "Cannot open savegame '%s' for saving/loading.", filename);
 		return SL_ERROR;
+	}
 	_sl.bufe = _sl.bufp = NULL;
 	_sl.offs_base = 0;
 	_sl.save = (mode != 0);
 	_sl.includes = _desc_includes;
 	_sl.chs = _chunk_handlers;
 	/* XXX - Setup setjmp error handler if an error occurs anywhere deep during

0 comments (0 inline, 0 general)