From e8c8ead3d348b5c9ed3994f37d761c2a4b5066af Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 16 Apr 2006 23:36:04 +0000
Subject: [PATCH] More menu stuff

git-svn-id: https://svn.eduke32.com/eduke32@36 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/game.c  |  2 +-
 polymer/eduke32/source/menus.c | 30 ++++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index e0fcff299..adfff93f0 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -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,
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 5239e6f7d..59aac40bc 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -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: