(svn r3640) - Remove win32-only variables from variables.h and put them into win32_v.c. Also ifdef the win32 specific configuration file settings.
--- a/settings.c Mon Feb 20 22:57:32 2006 +0000
+++ b/settings.c Mon Feb 20 23:01:58 2006 +0000
@@ -800,6 +800,11 @@
{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[] = {
{"display_hz", SDT_UINT, (void*)0, &_display_hz, NULL},
{"force_full_redraw", SDT_BOOL, (void*)false, &_force_full_redraw, NULL},
@@ -807,6 +812,7 @@
{"double_size", SDT_BOOL, (void*)false, &_double_size, NULL},
{NULL, 0, NULL, NULL, NULL}
};
+#endif /* WIN32 */
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"},
@@ -1060,7 +1066,9 @@
static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc)
{
proc(ini, misc_settings, "misc");
+#ifdef WIN32
proc(ini, win32_settings, "win32");
+#endif /* WIN32 */
#ifdef ENABLE_NETWORK
proc(ini, network_settings, "network");
#endif /* ENABLE_NETWORK */
--- a/variables.h Mon Feb 20 22:57:32 2006 +0000
+++ b/variables.h Mon Feb 20 23:01:58 2006 +0000
@@ -280,10 +280,6 @@
VARDEF byte _dirkeys; // 1=left, 2=up, 4=right, 8=down
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 _rightclick_emulate;
--- a/video/win32_v.c Mon Feb 20 22:57:32 2006 +0000
+++ b/video/win32_v.c Mon Feb 20 23:01:58 2006 +0000
@@ -27,6 +27,11 @@
bool running;
} _wnd;
+bool _force_full_redraw;
+bool _double_size;
+uint _display_hz;
+uint _fullscreen_bpp;
+
static void MakePalette(void)
{
LOGPALETTE *pal;