mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r20188) -Codechange: unVARDEF the _[config|log|highscore]_file variables and move them to a more logical location
This commit is contained in:
parent
5a836cdec7
commit
eb30ebe1a4
|
@ -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__)
|
||||
|
|
|
@ -56,6 +56,10 @@ 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()
|
||||
{
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -91,6 +91,7 @@ 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.
|
||||
|
|
|
@ -77,6 +77,7 @@ 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);
|
||||
|
|
|
@ -24,8 +24,4 @@ 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 */
|
||||
|
|
Loading…
Reference in New Issue