summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--settings.c6
-rw-r--r--settings.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/settings.c b/settings.c
index e021418b5..e6d70a00f 100644
--- a/settings.c
+++ b/settings.c
@@ -813,9 +813,9 @@ static const SettingDesc misc_settings[] = {
{"news_display_opt", SDT_UINT32, "0xAAAAAAAA", &_news_display_opt, NULL}, // default to all full messages: 10101010101010101010 = 0xAAAAAAAA
{"news_ticker_sound", SDT_BOOL, (void*)true, &_news_ticker_sound, NULL},
{"fullscreen", SDT_BOOL, (void*)false, &_fullscreen, NULL},
- {"videodriver", SDT_STRINGBUF | (lengthof(_ini_videodriver)<<16) | SDT_NOSAVE,NULL, _ini_videodriver, NULL},
- {"musicdriver", SDT_STRINGBUF | (lengthof(_ini_musicdriver)<<16) | SDT_NOSAVE,NULL, _ini_musicdriver, NULL},
- {"sounddriver", SDT_STRINGBUF | (lengthof(_ini_sounddriver)<<16) | SDT_NOSAVE,NULL, _ini_sounddriver, NULL},
+ {"videodriver", SDT_STRINGBUF | ((uint32)lengthof(_ini_videodriver)<<16) | SDT_NOSAVE,NULL, _ini_videodriver, NULL},
+ {"musicdriver", SDT_STRINGBUF | ((uint32)lengthof(_ini_musicdriver)<<16) | SDT_NOSAVE,NULL, _ini_musicdriver, NULL},
+ {"sounddriver", SDT_STRINGBUF | ((uint32)lengthof(_ini_sounddriver)<<16) | SDT_NOSAVE,NULL, _ini_sounddriver, NULL},
{"language", SDT_STRINGBUF | lengthof(_dynlang.curr_file)<<16, NULL, _dynlang.curr_file, NULL},
{"resolution", SDT_UINT16 | SDT_INTLIST | lengthof(_cur_resolution) << 16, "640,480",_cur_resolution, NULL},
{"screenshot_format", SDT_STRINGBUF | (lengthof(_screenshot_format_name)<<16), NULL, _screenshot_format_name,NULL},
diff --git a/settings.h b/settings.h
index 3b588593f..aaf27cda4 100644
--- a/settings.h
+++ b/settings.h
@@ -52,7 +52,7 @@ typedef enum {
typedef struct SettingDesc {
const char *name;
- int flags;
+ uint32 flags;
const void *def;
void *ptr;
const void *many;