zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 14:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow access to map12-map32 in multiplayer, and skip the ones that aren't defined

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@383 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-12-05 00:16:33 +00:00
parent 44e9f75e48
commit 9fc9365e2f
3 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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();

4
polymer/eduke32/source/gameexec.c
View file

@ -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)

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

@ -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)