798 {"shuffle", SDT_BOOL, (void*)false, &msf.shuffle, NULL}, |
798 {"shuffle", SDT_BOOL, (void*)false, &msf.shuffle, NULL}, |
799 {"extmidi", SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL}, |
799 {"extmidi", SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL}, |
800 {NULL, 0, NULL, NULL, NULL} |
800 {NULL, 0, NULL, NULL, NULL} |
801 }; |
801 }; |
802 |
802 |
|
803 /* win32_v.c only settings */ |
|
804 #ifdef WIN32 |
|
805 extern bool _force_full_redraw, _double_size; |
|
806 extern uint _display_hz, _fullscreen_bpp; |
|
807 |
803 static const SettingDesc win32_settings[] = { |
808 static const SettingDesc win32_settings[] = { |
804 {"display_hz", SDT_UINT, (void*)0, &_display_hz, NULL}, |
809 {"display_hz", SDT_UINT, (void*)0, &_display_hz, NULL}, |
805 {"force_full_redraw", SDT_BOOL, (void*)false, &_force_full_redraw, NULL}, |
810 {"force_full_redraw", SDT_BOOL, (void*)false, &_force_full_redraw, NULL}, |
806 {"fullscreen_bpp", SDT_UINT, (void*)8, &_fullscreen_bpp, NULL}, |
811 {"fullscreen_bpp", SDT_UINT, (void*)8, &_fullscreen_bpp, NULL}, |
807 {"double_size", SDT_BOOL, (void*)false, &_double_size, NULL}, |
812 {"double_size", SDT_BOOL, (void*)false, &_double_size, NULL}, |
808 {NULL, 0, NULL, NULL, NULL} |
813 {NULL, 0, NULL, NULL, NULL} |
809 }; |
814 }; |
|
815 #endif /* WIN32 */ |
810 |
816 |
811 static const SettingDesc misc_settings[] = { |
817 static const SettingDesc misc_settings[] = { |
812 {"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"}, |
818 {"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"}, |
813 {"news_display_opt", SDT_UINT32, "0xAAAAAAAA", &_news_display_opt, NULL}, // default to all full messages: 10101010101010101010 = 0xAAAAAAAA |
819 {"news_display_opt", SDT_UINT32, "0xAAAAAAAA", &_news_display_opt, NULL}, // default to all full messages: 10101010101010101010 = 0xAAAAAAAA |
814 {"news_ticker_sound", SDT_BOOL, (void*)true, &_news_ticker_sound, NULL}, |
820 {"news_ticker_sound", SDT_BOOL, (void*)true, &_news_ticker_sound, NULL}, |
1058 typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *grpname); |
1064 typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const char *grpname); |
1059 |
1065 |
1060 static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc) |
1066 static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc) |
1061 { |
1067 { |
1062 proc(ini, misc_settings, "misc"); |
1068 proc(ini, misc_settings, "misc"); |
|
1069 #ifdef WIN32 |
1063 proc(ini, win32_settings, "win32"); |
1070 proc(ini, win32_settings, "win32"); |
|
1071 #endif /* WIN32 */ |
1064 #ifdef ENABLE_NETWORK |
1072 #ifdef ENABLE_NETWORK |
1065 proc(ini, network_settings, "network"); |
1073 proc(ini, network_settings, "network"); |
1066 #endif /* ENABLE_NETWORK */ |
1074 #endif /* ENABLE_NETWORK */ |
1067 proc(ini, music_settings, "music"); |
1075 proc(ini, music_settings, "music"); |
1068 proc(ini, gameopt_settings, "gameopt"); |
1076 proc(ini, gameopt_settings, "gameopt"); |