okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add fixes to ui menu by Ensiform and DevHC (#5062)

Browse source
This commit is contained in:
Thilo Schulz 2011-07-07 16:12:53 +00:00
parent 74e538ffcf
commit 7666c2f54c
4 changed files with 50 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
code/q3_ui/ui_preferences.c
View file

@ -111,10 +111,6 @@ static void Preferences_Event( void* ptr, int notification ) {
switch( ((menucommon_s*)ptr)->id ) {
case ID_CROSSHAIR:
s_preferences.crosshair.curvalue++;
if( s_preferences.crosshair.curvalue == NUM_CROSSHAIRS ) {
s_preferences.crosshair.curvalue = 0;
}
trap_Cvar_SetValue( "cg_drawCrosshair", s_preferences.crosshair.curvalue );
break;
@ -252,7 +248,7 @@ static void Preferences_MenuInit( void ) {
s_preferences.framer.height = 334;
y = 144;
s_preferences.crosshair.generic.type = MTYPE_TEXT;
s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL;
s_preferences.crosshair.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NODEFAULTINIT|QMF_OWNERDRAW;
s_preferences.crosshair.generic.x = PREFERENCES_X_POS;
s_preferences.crosshair.generic.y = y;
@ -264,6 +260,7 @@ static void Preferences_MenuInit( void ) {
s_preferences.crosshair.generic.bottom = y + 20;
s_preferences.crosshair.generic.left = PREFERENCES_X_POS - ( ( strlen(s_preferences.crosshair.generic.name) + 1 ) * SMALLCHAR_WIDTH );
s_preferences.crosshair.generic.right = PREFERENCES_X_POS + 48;
s_preferences.crosshair.numitems = NUM_CROSSHAIRS;
y += BIGCHAR_HEIGHT+2+4;
s_preferences.simpleitems.generic.type = MTYPE_RADIOBUTTON;