diff options
| author | rubidium <rubidium@openttd.org> | 2007-03-12 15:25:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-03-12 15:25:33 +0000 |
| commit | 9299e76a252ad7d8e922bc929f9a3db736abaf81 (patch) | |
| tree | f2fd21e1aeb0a366961d416902ea7d78799eb615 /src/win32.cpp | |
| parent | 1c55149e1fb8aca7b94d0343779f8d7231a0259c (diff) | |
| download | openttd-9299e76a252ad7d8e922bc929f9a3db736abaf81.tar.xz | |
(svn r9129) -Codechange: unify parts of DeterminePaths.
Diffstat (limited to 'src/win32.cpp')
| -rw-r--r-- | src/win32.cpp | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/src/win32.cpp b/src/win32.cpp index b31f41d92..04f41602d 100644 --- a/src/win32.cpp +++ b/src/win32.cpp @@ -13,6 +13,7 @@ #include "string.h" #include "gfx.h" #include "window.h" +#include "fileio.h" #include <windows.h> #include <winnt.h> #include <wininet.h> @@ -942,42 +943,19 @@ void GetCurrentDirectoryW(int length, wchar_t *path) } #endif -void DeterminePaths() +void DetermineBasePaths() { - char *s, *cfg; - - _paths.personal_dir = _paths.game_data_dir = cfg = (char*)malloc(MAX_PATH); + _paths.personal_dir = _paths.game_data_dir = MallocT<char>(MAX_PATH); #if defined(UNICODE) TCHAR path[MAX_PATH]; GetCurrentDirectory(MAX_PATH - 1, path); - convert_from_fs(path, cfg, MAX_PATH); + convert_from_fs(path, _paths.personal_dir, MAX_PATH); #else - GetCurrentDirectory(MAX_PATH - 1, cfg); + GetCurrentDirectory(MAX_PATH - 1, _paths.personal_dir); #endif - cfg[0] = toupper(cfg[0]); - s = strchr(cfg, '\0'); - if (s[-1] != '\\') strcpy(s, "\\"); - - _paths.save_dir = str_fmt("%ssave", cfg); - _paths.autosave_dir = str_fmt("%s\\autosave", _paths.save_dir); - _paths.scenario_dir = str_fmt("%sscenario", cfg); - _paths.heightmap_dir = str_fmt("%sscenario\\heightmap", cfg); - _paths.gm_dir = str_fmt("%sgm\\", cfg); - _paths.data_dir = str_fmt("%sdata\\", cfg); - _paths.lang_dir = str_fmt("%slang\\", cfg); - - if (_config_file == NULL) - _config_file = str_fmt("%sopenttd.cfg", _paths.personal_dir); - - _highscore_file = str_fmt("%shs.dat", _paths.personal_dir); - _log_file = str_fmt("%sopenttd.log", _paths.personal_dir); - - // make (auto)save and scenario folder - CreateDirectory(OTTD2FS(_paths.save_dir), NULL); - CreateDirectory(OTTD2FS(_paths.autosave_dir), NULL); - CreateDirectory(OTTD2FS(_paths.scenario_dir), NULL); - CreateDirectory(OTTD2FS(_paths.heightmap_dir), NULL); + _paths.personal_dir[0] = toupper(_paths.personal_dir[0]); + AppendPathSeparator(_paths.personal_dir, MAX_PATH); } /** |