mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3640) - Remove win32-only variables from variables.h and put them into win32_v.c. Also ifdef the win32 specific configuration file settings.

release/0.5
Darkvater 2006-02-20 23:01:58 +00:00
parent 8104a720b9
commit c7e34bd103
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings.c
View File

@ -800,6 +800,11 @@ static const SettingDesc music_settings[] = {
{NULL, 0, NULL, NULL, NULL} {NULL, 0, NULL, NULL, NULL}
}; };
/* win32_v.c only settings */
#ifdef WIN32
extern bool _force_full_redraw, _double_size;
extern uint _display_hz, _fullscreen_bpp;
static const SettingDesc win32_settings[] = { static const SettingDesc win32_settings[] = {
{"display_hz", SDT_UINT, (void*)0, &_display_hz, NULL}, {"display_hz", SDT_UINT, (void*)0, &_display_hz, NULL},
{"force_full_redraw", SDT_BOOL, (void*)false, &_force_full_redraw, NULL}, {"force_full_redraw", SDT_BOOL, (void*)false, &_force_full_redraw, NULL},
@ -807,6 +812,7 @@ static const SettingDesc win32_settings[] = {
{"double_size", SDT_BOOL, (void*)false, &_double_size, NULL}, {"double_size", SDT_BOOL, (void*)false, &_double_size, NULL},
{NULL, 0, NULL, NULL, NULL} {NULL, 0, NULL, NULL, NULL}
}; };
#endif /* WIN32 */
static const SettingDesc misc_settings[] = { static const SettingDesc misc_settings[] = {
{"display_opt", SDT_MANYOFMANY | SDT_UINT8, (void*)(DO_SHOW_TOWN_NAMES|DO_SHOW_STATION_NAMES|DO_SHOW_SIGNS|DO_FULL_ANIMATION|DO_FULL_DETAIL|DO_TRANS_BUILDINGS|DO_WAYPOINTS), &_display_opt, "SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|TRANS_BUILDINGS|FULL_DETAIL|WAYPOINTS"}, {"display_opt", SDT_MANYOFMANY | SDT_UINT8, (void*)(DO_SHOW_TOWN_NAMES|DO_SHOW_STATION_NAMES|DO_SHOW_SIGNS|DO_FULL_ANIMATION|DO_FULL_DETAIL|DO_TRANS_BUILDINGS|DO_WAYPOINTS), &_display_opt, "SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|TRANS_BUILDINGS|FULL_DETAIL|WAYPOINTS"},
@ -1060,7 +1066,9 @@ typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *
static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc) static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc)
{ {
proc(ini, misc_settings, "misc"); proc(ini, misc_settings, "misc");
#ifdef WIN32
proc(ini, win32_settings, "win32"); proc(ini, win32_settings, "win32");
#endif /* WIN32 */
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
proc(ini, network_settings, "network"); proc(ini, network_settings, "network");
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */

4
variables.h
View File

@ -280,10 +280,6 @@ VARDEF bool _shift_pressed; // Is Alt pressed?
VARDEF byte _dirkeys; // 1=left, 2=up, 4=right, 8=down VARDEF byte _dirkeys; // 1=left, 2=up, 4=right, 8=down
VARDEF bool _fullscreen; VARDEF bool _fullscreen;
VARDEF bool _double_size;
VARDEF uint _display_hz;
VARDEF bool _force_full_redraw;
VARDEF uint _fullscreen_bpp;
VARDEF bool _fast_forward; VARDEF bool _fast_forward;
VARDEF bool _rightclick_emulate; VARDEF bool _rightclick_emulate;

5
video/win32_v.c
View File

@ -27,6 +27,11 @@ static struct {
bool running; bool running;
} _wnd; } _wnd;
bool _force_full_redraw;
bool _double_size;
uint _display_hz;
uint _fullscreen_bpp;
static void MakePalette(void) static void MakePalette(void)
{ {
LOGPALETTE *pal; LOGPALETTE *pal;