dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3732) - Fix two warnings. Stupid MSVC didn't even complain :s (Thank Tron and peter1138)

Browse Source 
- NOTE! There are a few warnings left in settings_gui because tha callback functions are disabled. I still need a good place for them.
This commit is contained in:
Darkvater
2006-03-02 09:57:28 +00:00
parent db4777c818
commit d1a6223365
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settings.c
View File

@@ -961,7 +961,7 @@ static const SettingDesc _music_settings[] = {
extern bool _force_full_redraw, _double_size;
extern uint _display_hz, _fullscreen_bpp;
extern const SettingDescGlobVarList _win32_settings[] = {
static const SettingDescGlobVarList _win32_settings[] = {
SDTG_VAR("display_hz", SLE_UINT, S, 0, _display_hz, 0, 0, 120, STR_NULL, NULL),
SDTG_BOOL("force_full_redraw", S, 0, _force_full_redraw,false, STR_NULL, NULL),
SDTG_VAR("fullscreen_bpp", SLE_UINT, S, 0, _fullscreen_bpp, 8, 8, 32, STR_NULL, NULL),

6
settings_gui.c
View File

@@ -711,13 +711,11 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false;
if (sdb->cmd == SDT_BOOLX) {
static const _bool_ctabs[4] = {9, 7, 4, 6};
static const int _bool_ctabs[2][2] = {{9, 4}, {7, 6}};
/* Draw checkbox for boolean-value either on/off */
bool on = (*(bool*)var);
byte ctab = !!on + (!!editable * 2);
assert(ctab < lengthof(_bool_ctabs));
DrawFrameRect(x, y, x + 19, y + 8, _bool_ctabs[ctab], on ? FR_LOWERED : 0);
DrawFrameRect(x, y, x + 19, y + 8, _bool_ctabs[!!on][!!editable], on ? FR_LOWERED : 0);
SetDParam(0, on ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF);
} else {
int32 value;