cpp/openttd-patchpack/source Changeset - r15519:60d357105db2

Changeset - r15519:60d357105db2

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium - 14 years ago 2010-07-19 17:11:09
rubidium@openttd.org

(svn r20188) -Codechange: unVARDEF the _[config|log|highscore]_file variables and move them to a more logical location

6 files changed with 9 insertions and 4 deletions:

src/dedicated.cpp

src/fileio.cpp

src/highscore.cpp

src/openttd.cpp

src/settings.cpp

src/variables.h

0 comments (0 inline, 0 general)

src/dedicated.cpp

➞

Show inline comments

@@ @@ -8,12 +8,14 @@ @@
  */
 /** @file dedicated.cpp Forking support for dedicated servers. */
 #include "stdafx.h"
 char *_log_file; ///< File to reroute output of a forked OpenTTD to
 #ifdef ENABLE_NETWORK
 #if defined(UNIX) && !defined(__MORPHOS__)
 #include "variables.h"

src/fileio.cpp

➞

Show inline comments

@@ @@ -53,12 +53,16 @@ struct Fio { @@
 static Fio _fio;
 /** 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()
+{
 	return _fio.pos + (_fio.buffer - _fio.buffer_end);
+}

src/highscore.cpp

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "table/strings.h"
 #include "core/sort_func.hpp"
 #include "variables.h"
 #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,
 	STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN,
 	STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN,
 	STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN,

src/openttd.cpp

➞

Show inline comments

@@ @@ -88,12 +88,13 @@ void ProcessAsyncSaveFinish(); @@
 void CallWindowTickEvent();
 extern void SetDifficultyLevel(int mode, DifficultySettings *gm_opt);
 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.
  * @param s the string to print.
  * @note Does NEVER return.
  */

src/settings.cpp

➞

Show inline comments

@@ @@ -74,12 +74,13 @@ @@
 #include "table/settings.h"
 ClientSettings _settings_client;
 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);
 static bool IsSignedVarMemType(VarType vt);

src/variables.h

➞

Show inline comments

@@ @@ -21,11 +21,7 @@ VARDEF uint16 _tick_counter; @@
 VARDEF byte _display_opt;
 /* IN/OUT parameters to commands */
 VARDEF bool _generating_world;
 VARDEF char *_config_file;
 VARDEF char *_highscore_file;
 VARDEF char *_log_file;
 #endif /* VARIABLES_H */

0 comments (0 inline, 0 general)