zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 06:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

More menu stuff

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@36 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-16 23:36:04 +00:00
parent 65a7a943a0
commit e8c8ead3d3
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/game.c
View file

@ -2784,7 +2784,7 @@ void displayrest(long smoothratio)
(ps[myconnectindex].player_par/26)%60);
minitext(320-5*12,200-i-6-6-6,tempbuf,0,26);
if(ud.player_skill > 3 || !(gametype_flags[ud.coop] & GAMETYPE_FLAG_PLAYERSFRIENDLY))
if(ud.player_skill > 3 || (ud.multimode > 1 && !(gametype_flags[ud.coop] & GAMETYPE_FLAG_PLAYERSFRIENDLY)))
Bsprintf(tempbuf,"Kills: %ld",ud.multimode>1?ps[i].frag-ps[i].fraggedself:ps[myconnectindex].actors_killed);
else
Bsprintf(tempbuf,"Kills: %ld/%ld",ps[myconnectindex].actors_killed,

30
polymer/eduke32/source/menus.c
View file

@ -649,7 +649,7 @@ void menus(void)
}
else if (x == 0) cmenu(20011);
menutext(40,50,0,0,"GAME OPTIONS");
menutext(40,50,0,0, "GAME OPTIONS");
minitext(90,60, "GAME TYPE" ,2,26);
minitext(90,60+8, "EPISODE" ,2,26);
minitext(90,60+8+8, "LEVEL" ,2,26);
@ -1513,7 +1513,7 @@ cheat_for_port_credits:
if(KB_KeyPressed(sc_Q)) cmenu(500);
if(x == -1)
if(x == -1 && (ps[myconnectindex].gm&MODE_GAME || ud.recstat == 2))
{
ps[myconnectindex].gm &= ~MODE_MENU;
if(ud.multimode < 2 && ud.recstat != 2)
@ -2220,10 +2220,10 @@ cheat_for_port_credits:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
menutext(320>>1,24,0,0,"OPTIONS");
c = 200>>1;
c = 50;
onbar = 0;
x = probe(160,c-18-18-18,18,6);
x = probe(160,c,18,6);
switch (x) {
case -1:
@ -2276,12 +2276,12 @@ cheat_for_port_credits:
break;
}
menutext(160,c-18-18-18,0,0,"GAME OPTIONS");
menutext(160,c-18-18, 0,0,"SOUND OPTIONS");
menutext(160,c-18, 0,0,"VIDEO SETTINGS");
menutext(160,c, 0,0,"KEYBOARD SETUP");
menutext(160,c+18, 0,0,"MOUSE SETUP");
menutext(160,c+18+18, 0,CONTROL_JoyPresent==0 || CONTROL_JoystickEnabled==0,"JOYSTICK SETUP");
menutext(160,c, 0,0,"GAME OPTIONS");
menutext(160,c+18, 0,0,"SOUND OPTIONS");
menutext(160,c+18+18, 0,0,"VIDEO SETTINGS");
menutext(160,c+18+18+18, 0,0,"KEYBOARD SETUP");
menutext(160,c+18+18+18+18, 0,0,"MOUSE SETUP");
menutext(160,c+18+18+18+18+18, 0,CONTROL_JoyPresent==0 || CONTROL_JoystickEnabled==0,"JOYSTICK SETUP");
break;
// JBF 20031206: Video settings menu
@ -3887,6 +3887,16 @@ VOLUME_ALL_40x:
x = probe(c,57-8,16,8);
modval(0,num_gametypes-1,(int *)&ud.m_coop,1,probey==0);
if(!VOLUMEONE)
modval(0,num_volumes-1,(int *)&ud.m_volume_number,1,probey==1);
modval(0,ud.m_volume_number == 0?6:10,(int *)&ud.m_level_number,1,probey==2);
if((gametype_flags[ud.m_coop] & GAMETYPE_FLAG_MARKEROPTION))
modval(0,1,(int *)&ud.m_marker,1,probey==4);
if((gametype_flags[ud.m_coop] & GAMETYPE_FLAG_COOP))
modval(0,1,(int *)&ud.m_ffire,1,probey==5);
switch(x)
{
case -1: