diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 11:27:22 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:00 +0000 |
| commit | f65675275f974129c76249e374b5423a2a444acd (patch) | |
| tree | 1da97a1bd26d179ad9da2342df8060638d24ef8a /ui | |
| parent | e5d4b2471e72ff574ebc0d01afbab50fc447cf5a (diff) | |
* s/r_custom/r_/
* Remove r_mode, making r_width and r_height the only way to choose resolution
* Add UI code to parse the detected resolutions list
* Make ITEM_TYPE_COMBO do something; basically an ITEM_TYPE_MULTI which is
populated by a feeder. A proper combobox widget would be better... in the
future maybe
* Improve keyboard/mouse button control on ITEM_TYPE_MULTI
* Change resolution selection in options menu to use an ITEM_TYPE_COMBO fed by
FEEDER_RESOLUTIONS
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ingame_options.menu | 8 | ||||
| -rw-r--r-- | ui/menudef.h | 1 | ||||
| -rw-r--r-- | ui/options.menu | 8 |
3 files changed, 5 insertions, 12 deletions
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu index e4b68229..8bcee715 100644 --- a/ui/ingame_options.menu +++ b/ui/ingame_options.menu @@ -1396,12 +1396,9 @@ { name ghardware group optionsGrp - type ITEM_TYPE_MULTI + type ITEM_TYPE_COMBO text "Video Mode:" - cvar "r_mode" - cvarFloatList { "320x240" 0 "400x300" 1 "512x384" 2 "640x480" 3 - "800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7 - "1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 } + feeder FEEDER_RESOLUTIONS rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H textalign ALIGN_RIGHT textvalign VALIGN_CENTER @@ -1412,7 +1409,6 @@ action { play "sound/misc/menu1.wav"; - uiScript glCustom } } diff --git a/ui/menudef.h b/ui/menudef.h index 19ffe196..18432272 100644 --- a/ui/menudef.h +++ b/ui/menudef.h @@ -80,6 +80,7 @@ #define FEEDER_TREMHUMANBUILD 19 // human buildables #define FEEDER_IGNORE_LIST 20 // ignored players #define FEEDER_HELP_LIST 21 // help topics +#define FEEDER_RESOLUTIONS 22 // display resolutions // display flags #define UI_SHOW_FAVORITESERVERS 0x00000001 diff --git a/ui/options.menu b/ui/options.menu index 9959949d..a39746fa 100644 --- a/ui/options.menu +++ b/ui/options.menu @@ -82,12 +82,9 @@ itemDef { - type ITEM_TYPE_MULTI + type ITEM_TYPE_COMBO text "Video Mode:" - cvar "r_mode" - cvarFloatList { "Custom" -1 "320x240" 0 "400x300" 1 "512x384" 2 "640x480" 3 - "800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7 - "1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 } + feeder FEEDER_RESOLUTIONS rect X (Y+(2*ELEM_H)) W ELEM_H textalign ALIGN_RIGHT textalignx TOFF_X @@ -98,7 +95,6 @@ action { play "sound/misc/menu1.wav"; - uiScript glCustom } } |