Mercurial > hg > openttd
changeset 15529:152dcc71db0d draft
(svn r20188) -Codechange: unVARDEF the _[config|log|highscore]_file variables and move them to a more logical location
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 19 Jul 2010 17:11:09 +0000 |
| parents | 8e6b5d370794 |
| children | d2f5d90e6265 |
| files | src/dedicated.cpp src/fileio.cpp src/highscore.cpp src/openttd.cpp src/settings.cpp src/variables.h |
| diffstat | 6 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dedicated.cpp +++ b/src/dedicated.cpp @@ -11,6 +11,8 @@ #include "stdafx.h" +char *_log_file; ///< File to reroute output of a forked OpenTTD to + #ifdef ENABLE_NETWORK #if defined(UNIX) && !defined(__MORPHOS__)
--- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -56,6 +56,10 @@ /** Whether the working directory should be scanned. */ static bool _do_scan_working_directory = true; +extern char *_config_file; +extern char *_highscore_file; +extern char *_log_file; + /* Get current position in file */ size_t FioGetPos() {
--- a/src/highscore.cpp +++ b/src/highscore.cpp @@ -22,6 +22,7 @@ #include "debug.h" HighScore _highscore_table[5][5]; // 4 difficulty-settings (+ network); top 5 +char *_highscore_file; ///< The file to store the highscore data in. static const StringID _endgame_perf_titles[] = { STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN,
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -91,6 +91,7 @@ extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY); extern void ShowOSErrorBox(const char *buf, bool system); extern bool _dedicated_forks; +extern char *_config_file; /** * Error handling for fatal user errors.
--- a/src/settings.cpp +++ b/src/settings.cpp @@ -77,6 +77,7 @@ GameSettings _settings_game; GameSettings _settings_newgame; VehicleDefaultSettings _old_vds; ///< Used for loading default vehicles settings from old savegames +char *_config_file; ///< Configuration file of OpenTTD typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *grpname, void *object); typedef void SettingDescProcList(IniFile *ini, const char *grpname, StringList *list);