From 9fc9365e2f9ca64e2ceb282716b806a7bdec82fc Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 5 Dec 2006 00:16:33 +0000
Subject: [PATCH] Allow access to map12-map32 in multiplayer, and skip the ones
 that aren't defined

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

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 08ba5d713..7a4a8ef03 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7427,7 +7427,7 @@ FOUNDCHEAT:
                             if (VOLUMEALL)
                             {
                                 volnume = cheatbuf[i] - '0';
-                                levnume = (cheatbuf[i+1] - '0')*10+(cheatbuf[i+2]-'0');
+                                levnume = (cheatbuf[i+1] - '0')*(MAXLEVELS-1)+(cheatbuf[i+2]-'0');
                             }
                             else
                             {
@@ -7461,7 +7461,7 @@ FOUNDCHEAT:
                             }
                             else
                             {
-                                if (levnume >= 11)
+                                if (levnume >= MAXLEVELS)
                                 {
                                     ps[myconnectindex].cheat_phase = 0;
                                     KB_FlushKeyBoardQueue();
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 0896cc1dd..24eeb1450 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -4388,7 +4388,7 @@ SKIPJIBS:
         volnume=GetGameVarID(*insptr++,g_i,g_p);
         levnume=GetGameVarID(*insptr++,g_i,g_p);
 
-        if (volnume > num_volumes || volnume < 0)
+        if (volnume > MAXVOLUMES-1 || volnume < 0)
         {
             /*
             if(g_cmddebug&CMDDEBUG_COMPILE)
@@ -4400,7 +4400,7 @@ SKIPJIBS:
             break;
         }
 
-        if (levnume >= 11 || levnume <0)
+        if (levnume > MAXLEVELS-1 || levnume <0)
         {
             /*
             if(g_cmddebug&CMDDEBUG_COMPILE)
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 7b81d0770..6c71528e5 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -882,6 +882,7 @@ void menus(void)
 
         break;
 
+#if 0
     case 20010:
         rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
         menutext(160,24,0,0,"HOST NETWORK GAME");
@@ -1152,7 +1153,7 @@ void menus(void)
         // PORT
         // CONNECT
         break;
-
+#endif
     case 15001:
     case 15000:
 
@@ -1983,8 +1984,6 @@ cheat_for_port_credits:
             else cmenu(0);
         }
 
-
-
         c = 80;
         if (VOLUMEONE)
         {
@@ -4576,7 +4575,10 @@ VOLUME_ALL_40x:
         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+(boardfilename[0]!=0):10,(int *)&ud.m_level_number,1,probey==2);
+
+        i = ud.m_level_number;
+
+        modval(0,ud.m_volume_number == 0?6+(boardfilename[0]!=0):MAXLEVELS-1,(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);
@@ -4584,6 +4586,23 @@ VOLUME_ALL_40x:
             modval(0,1,(int *)&ud.m_ffire,1,probey==5);
         else modval(0,1,(int *)&ud.m_noexits,1,probey==5);
 
+        if (probey == 1)
+            if (ud.m_volume_number == 0 && ud.m_level_number > 6+(boardfilename[0]!=0))
+                ud.m_level_number = 0;
+
+        while (level_names[(ud.m_volume_number*MAXLEVELS)+ud.m_level_number] == NULL)
+        {
+            if (ud.m_level_number < i || i == 0)
+                ud.m_level_number--;
+            else ud.m_level_number++;
+
+            if (ud.m_level_number > MAXLEVELS-1 || ud.m_level_number < 0)
+            {
+                ud.m_level_number = 0;
+                break;
+            }
+        }
+
         switch (x)
         {
         case -1:
@@ -4600,9 +4619,9 @@ VOLUME_ALL_40x:
             {
                 ud.m_volume_number++;
                 if (ud.m_volume_number == num_volumes) ud.m_volume_number = 0;
-                if (ud.m_volume_number == 0 && ud.m_level_number > 6)
+                if (ud.m_volume_number == 0 && ud.m_level_number > 6+(boardfilename[0]!=0))
                     ud.m_level_number = 0;
-                if (ud.m_level_number > 10) ud.m_level_number = 0;
+                if (ud.m_level_number > MAXLEVELS-1) ud.m_level_number = 0;
             }
             break;
         case 2:
@@ -4617,7 +4636,7 @@ VOLUME_ALL_40x:
                 if (ud.m_volume_number == 0 && ud.m_level_number > 5)
                     ud.m_level_number = 0;
             }
-            if (ud.m_level_number > 10) ud.m_level_number = 0;
+            if (ud.m_level_number > MAXLEVELS-1) ud.m_level_number = 0;
             break;
         case 3:
             if (ud.m_monsters_off == 1 && ud.m_player_skill > 0)