zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@445 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2007-01-05 23:40:37 +00:00
parent fc4bc3ef70
commit 8a3ca3dbc4
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
polymer/eduke32/source/menus.c
View File

@ -822,7 +822,7 @@ void menus(void)
menutext(40,50+16+16,MENUHIGHLIGHT(2),0,"TEAM"); menutext(40,50+16+16,MENUHIGHLIGHT(2),0,"TEAM");
menutext(40,50+16+16+16,MENUHIGHLIGHT(3),0,"AUTO AIM"); menutext(40,50+16+16+16,MENUHIGHLIGHT(3),0,"AUTO AIM");
menutext(40,50+16+16+16+16,MENUHIGHLIGHT(4),0,"WEAPON SWITCH"); menutext(40,50+16+16+16+16,MENUHIGHLIGHT(4),0,"WEAPON SWITCH");
menutext(40,50+16+16+16+16+16,MENUHIGHLIGHT(5),0,"AIMING TYPE"); menutext(40,50+16+16+16+16+16,MENUHIGHLIGHT(5),0,"MOUSE AIM TYPE");
menutext(40,50+16+16+16+16+16+16,MENUHIGHLIGHT(6),0,"TAUNT MACRO SETUP"); menutext(40,50+16+16+16+16+16+16,MENUHIGHLIGHT(6),0,"TAUNT MACRO SETUP");
if (current_menu == 20002) if (current_menu == 20002)
@ -846,7 +846,7 @@ void menus(void)
char *s[] = { "Off", "On pickup", "When empty", "Both" }; char *s[] = { "Off", "On pickup", "When empty", "Both" };
gametext(200,50+16+16+16+16-9,s[ud.weaponswitch],MENUHIGHLIGHT(4),2+8+16); gametext(200,50+16+16+16+16-9,s[ud.weaponswitch],MENUHIGHLIGHT(4),2+8+16);
} }
gametext(200,50+16+16+16+16+16-9,ud.mouseaiming?"Held":"Toggle",MENUHIGHLIGHT(5),2+8+16); gametext(200,50+16+16+16+16+16-9,ud.mouseaiming?"Hold button":"Toggle on/off",MENUHIGHLIGHT(5),2+8+16);
break; break;
@ -3339,6 +3339,12 @@ cheat_for_port_credits:
} }
if (!ud.mouseaiming) modval(0,1,(int *)&myaimmode,1,probey == (MAXMOUSEBUTTONS-2)*2+2+1); if (!ud.mouseaiming) modval(0,1,(int *)&myaimmode,1,probey == (MAXMOUSEBUTTONS-2)*2+2+1);
else if (probey == (MAXMOUSEBUTTONS-2)*2+2+1)
{
gametext(160,144+9+9,"SET MOUSE AIM TYPE TO TOGGLE ON/OFF",0,2+8+16);
gametext(160,144+9+9+9,"IN THE PLAYER SETUP MENU",0,2+8+16);
}
modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2); modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2);
gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):15, 0); gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):15, 0);
@ -3562,6 +3568,16 @@ cheat_for_port_credits:
break; break;
} }
switch (probey)
{
case 3:
case 4:
case 5:
case 6:
gametext(160,144+9+9,"DIGITAL AXES ARE NOT FOR MOUSE LOOK",0,2+8+16);
break;
}
menutext(c,46,MENUHIGHLIGHT(0),0,"X-AXIS SCALE"); menutext(c,46,MENUHIGHLIGHT(0),0,"X-AXIS SCALE");
l = (MouseAnalogueScale[0]+262144) >> 13; l = (MouseAnalogueScale[0]+262144) >> 13;
bar(c+160+40,46,(short *)&l,1,x==0,MENUHIGHLIGHT(0),0); bar(c+160+40,46,(short *)&l,1,x==0,MENUHIGHLIGHT(0),0);