cpp/openttd-patchpack/source Changeset - r20927:6e37de998bbe

Changeset - r20927:6e37de998bbe

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 11 years ago 2013-11-13 18:57:25
rubidium@openttd.org

(svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow

2 files changed with 8 insertions and 7 deletions:

src/fileio.cpp

src/fileio_func.h

0 comments (0 inline, 0 general)

src/fileio.cpp

➞

Show inline comments

@@ @@ -1143,7 +1143,7 @@ extern void cocoaSetApplicationBundleDir @@
+}
 #endif /* defined(WIN32) || defined(WINCE) */
 char *_personal_dir;
+const char *_personal_dir;
 /**
  * Acquire the base paths (personal dir and game data dir),
@@ @@ -1162,13 +1162,14 @@ void DeterminePaths(const char *exe) @@
+	}
 	if (_config_file != NULL) {
 		_personal_dir = strdup(_config_file);
 		char *end = strrchr(_personal_dir, PATHSEPCHAR);
 		char *dir = strdup(_config_file);
 		char *end = strrchr(dir, PATHSEPCHAR);
 		if (end == NULL) {
-			_personal_dir[0] = '\0';
+			dir[0] = '\0';
 		} else {
 			end[1] = '\0';
+		}
 		_personal_dir = dir;
 	} else {
 		char personal_dir[MAX_PATH];
 		if (FioFindFullPath(personal_dir, lengthof(personal_dir), BASE_DIR, "openttd.cfg") != NULL) {
@@ @@ -1195,9 +1196,9 @@ void DeterminePaths(const char *exe) @@
 	_highscore_file = str_fmt("%shs.dat", _personal_dir);
 	extern char *_hotkeys_file;
-	_hotkeys_file = str_fmt("%shotkeys.cfg",  _personal_dir);
 	_hotkeys_file = str_fmt("%shotkeys.cfg", _personal_dir);
 	extern char *_windows_file;
-	_windows_file = str_fmt("%swindows.cfg",  _personal_dir);
 	_windows_file = str_fmt("%swindows.cfg", _personal_dir);
 	/* Make the necessary folders */
 #if !defined(__MORPHOS__) && !defined(__AMIGA__) && defined(WITH_PERSONAL_DIR)

src/fileio_func.h

➞

Show inline comments

@@ @@ -67,7 +67,7 @@ const char *FioTarFirstDir(const char *t @@
 void FioTarAddLink(const char *src, const char *dest, Subdirectory subdir);
 bool ExtractTar(const char *tar_filename, Subdirectory subdir);
 extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.
+extern const char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.
 /** Helper for scanning for files with a given name */
 class FileScanner {

0 comments (0 inline, 0 general)