mirror of https://github.com/OpenTTD/OpenTTD
(svn r11839) -Codechange: move some variables from variables.h to a more logical location.
parent
27e5deb719
commit
3ca95f2a85
|
@ -130,4 +130,6 @@ public:
|
|||
const char *GetName();
|
||||
};
|
||||
|
||||
extern char _ini_blitter[32];
|
||||
|
||||
#endif /* BLITTER_FACTORY_HPP */
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "table/strings.h"
|
||||
|
||||
const char *_cmd_text = NULL;
|
||||
StringID _error_message;
|
||||
|
||||
/**
|
||||
* Helper macro to define the header of all command handler macros.
|
||||
|
|
|
@ -77,6 +77,7 @@ void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, Comma
|
|||
*/
|
||||
extern const char *_cmd_text;
|
||||
extern Money _additional_cash_required;
|
||||
extern StringID _error_message;
|
||||
|
||||
/**
|
||||
* Checks if a integer value belongs to a command.
|
||||
|
|
|
@ -11,9 +11,19 @@
|
|||
#include "music/music_driver.hpp"
|
||||
#include "video/video_driver.hpp"
|
||||
|
||||
SoundDriver *_sound_driver;
|
||||
MusicDriver *_music_driver;
|
||||
VideoDriver *_video_driver;
|
||||
char _ini_videodriver[32];
|
||||
int _num_resolutions;
|
||||
uint16 _resolutions[32][2];
|
||||
uint16 _cur_resolution[2];
|
||||
|
||||
SoundDriver *_sound_driver;
|
||||
char _ini_sounddriver[32];
|
||||
|
||||
MusicDriver *_music_driver;
|
||||
char _ini_musicdriver[32];
|
||||
|
||||
char _ini_blitter[32];
|
||||
|
||||
static const char* GetDriverParam(const char* const* parm, const char* name)
|
||||
{
|
||||
|
|
|
@ -31,5 +31,6 @@ public:
|
|||
};
|
||||
|
||||
extern MusicDriver *_music_driver;
|
||||
extern char _ini_musicdriver[32];
|
||||
|
||||
#endif /* MUSIC_MUSIC_DRIVER_HPP */
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "town.h"
|
||||
#include "player_func.h"
|
||||
#include "player_base.h"
|
||||
#include "command_func.h"
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "transparency.h"
|
||||
#include "functions.h"
|
||||
#include "town.h"
|
||||
#include "command_func.h"
|
||||
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -51,6 +51,10 @@
|
|||
#include "string_func.h"
|
||||
#include "gui.h"
|
||||
#include "town.h"
|
||||
#include "video/video_driver.hpp"
|
||||
#include "sound/sound_driver.hpp"
|
||||
#include "music/music_driver.hpp"
|
||||
#include "blitter/factory.hpp"
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
|
|
|
@ -23,5 +23,6 @@ public:
|
|||
};
|
||||
|
||||
extern SoundDriver *_sound_driver;
|
||||
extern char _ini_sounddriver[32];
|
||||
|
||||
#endif /* SOUND_SOUND_DRIVER_HPP */
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "date_func.h"
|
||||
#include "variables.h"
|
||||
#include "settings_type.h"
|
||||
#include "command_func.h"
|
||||
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "player_base.h"
|
||||
#include "fios.h"
|
||||
#include "settings_type.h"
|
||||
#include "video/video_driver.hpp"
|
||||
|
||||
#include "table/strings.h"
|
||||
#include "table/control_codes.h"
|
||||
|
|
|
@ -79,8 +79,6 @@ VARDEF int _autosave_ctr;
|
|||
VARDEF byte _display_opt;
|
||||
VARDEF int _caret_timer;
|
||||
|
||||
VARDEF StringID _error_message;
|
||||
|
||||
VARDEF bool _rightclick_emulate;
|
||||
|
||||
/* IN/OUT parameters to commands */
|
||||
|
@ -91,19 +89,12 @@ VARDEF bool _generating_world;
|
|||
VARDEF byte _switch_mode;
|
||||
VARDEF StringID _switch_mode_errorstr;
|
||||
|
||||
VARDEF char _ini_videodriver[32], _ini_musicdriver[32], _ini_sounddriver[32], _ini_blitter[32];
|
||||
|
||||
VARDEF int _num_resolutions;
|
||||
VARDEF uint16 _resolutions[32][2];
|
||||
VARDEF uint16 _cur_resolution[2];
|
||||
|
||||
VARDEF char _savegame_format[8];
|
||||
|
||||
VARDEF char *_config_file;
|
||||
VARDEF char *_highscore_file;
|
||||
VARDEF char *_log_file;
|
||||
|
||||
|
||||
/* landscape.cpp */
|
||||
extern const byte _tileh_to_sprite[32];
|
||||
|
||||
|
|
|
@ -31,5 +31,9 @@ public:
|
|||
};
|
||||
|
||||
extern VideoDriver *_video_driver;
|
||||
extern char _ini_videodriver[32];
|
||||
extern int _num_resolutions;
|
||||
extern uint16 _resolutions[32][2];
|
||||
extern uint16 _cur_resolution[2];
|
||||
|
||||
#endif /* VIDEO_VIDEO_DRIVER_HPP */
|
||||
|
|
Loading…
Reference in New Issue