zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

These changes got lost somehow

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@968 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-08-11 10:38:46 +00:00
parent f79f6f803b
commit fc1551af49
1 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "gamedef.h" #include "gamedef.h"
#include "scriplib.h" #include "scriplib.h"
#include "osdcmds.h"
#include "osd.h" #include "osd.h"
void restoremapstate(mapstate_t *save); void restoremapstate(mapstate_t *save);
@ -5265,42 +5266,54 @@ static int parse(void)
switch (tw) switch (tw)
{ {
case CON_HEADSPRITESTAT: case CON_HEADSPRITESTAT:
if (j >= 0 && j < MAXSTATUS+1) if (j < 0 || j > MAXSTATUS)
{
OSD_Printf(CON_ERROR "invalid status list %d\n",line_num,keyw[tw],j);
break;
}
SetGameVarID(i,headspritestat[j],g_i,g_p); SetGameVarID(i,headspritestat[j],g_i,g_p);
else
OSD_Printf(CON_ERROR "invalid state %d\n",line_num,keyw[tw],j);
break; break;
case CON_PREVSPRITESTAT: case CON_PREVSPRITESTAT:
if (j >= 0 && j < MAXSPRITES) if (j < 0 || j >= MAXSPRITES)
SetGameVarID(i,prevspritestat[j],g_i,g_p); {
else
OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j); OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j);
break; break;
}
SetGameVarID(i,prevspritestat[j],g_i,g_p);
break;
case CON_NEXTSPRITESTAT: case CON_NEXTSPRITESTAT:
if (j >= 0 && j < MAXSPRITES) if (j < 0 || j >= MAXSPRITES)
SetGameVarID(i,nextspritestat[j],g_i,g_p); {
else
OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j); OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j);
break; break;
}
SetGameVarID(i,nextspritestat[j],g_i,g_p);
break;
case CON_HEADSPRITESECT: case CON_HEADSPRITESECT:
if (j >= 0 && j < MAXSECTORS+1) if (j < 0 || j > numsectors)
{
OSD_Printf(CON_ERROR "invalid sector %d\n",line_num,keyw[tw],j);
break;
}
SetGameVarID(i,headspritesect[j],g_i,g_p); SetGameVarID(i,headspritesect[j],g_i,g_p);
else
OSD_Printf(CON_ERROR "invalid state %d\n",line_num,keyw[tw],j);
break; break;
case CON_PREVSPRITESECT: case CON_PREVSPRITESECT:
if (j >= 0 && j < MAXSPRITES) if (j < 0 || j >= MAXSPRITES)
SetGameVarID(i,prevspritesect[j],g_i,g_p); {
else
OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j); OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j);
break; break;
}
SetGameVarID(i,prevspritesect[j],g_i,g_p);
break;
case CON_NEXTSPRITESECT: case CON_NEXTSPRITESECT:
if (j >= 0 || j < MAXSPRITES) if (j < 0 || j >= MAXSPRITES)
SetGameVarID(i,nextspritesect[j],g_i,g_p); {
else
OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j); OSD_Printf(CON_ERROR "invalid sprite ID %d\n",line_num,keyw[tw],j);
break; break;
} }
SetGameVarID(i,nextspritesect[j],g_i,g_p);
break;
}
break; break;
} }
@ -5661,7 +5674,7 @@ static int parse(void)
insptr++; insptr++;
{ {
int lIn=GetGameVarID(*insptr++, g_i, g_p); int lIn=GetGameVarID(*insptr++, g_i, g_p);
if (g_sp->sectnum < 0 || g_sp->sectnum >= MAXSECTORS) if (g_sp->sectnum < 0 || g_sp->sectnum >= numsectors)
{ {
OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum); OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum);
break; break;
@ -5688,7 +5701,7 @@ static int parse(void)
case CON_QSPAWN: case CON_QSPAWN:
insptr++; insptr++;
if (g_sp->sectnum < 0 || g_sp->sectnum >= MAXSECTORS) if (g_sp->sectnum < 0 || g_sp->sectnum >= numsectors)
{ {
OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum); OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum);
insptr++; insptr++;
@ -5724,7 +5737,7 @@ static int parse(void)
hittype[g_i].temp_data[9] = 1; hittype[g_i].temp_data[9] = 1;
} }
if (g_sp->sectnum < 0 || g_sp->sectnum >= MAXSECTORS) if (g_sp->sectnum < 0 || g_sp->sectnum >= numsectors)
{ {
OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum); OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum);
insptr++; insptr++;
@ -5757,7 +5770,7 @@ static int parse(void)
} }
j=GetGameVarID(*insptr++, g_i, g_p); j=GetGameVarID(*insptr++, g_i, g_p);
if (g_sp->sectnum < 0 || g_sp->sectnum >= MAXSECTORS) if (g_sp->sectnum < 0 || g_sp->sectnum >= numsectors)
{ {
OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum); OSD_Printf(CON_ERROR "Invalid sector %d\n",line_num,keyw[tw],g_sp->sectnum);
hittype[g_i].temp_data[9]=0; hittype[g_i].temp_data[9]=0;
@ -7511,6 +7524,17 @@ static int parse(void)
playmusic(&map[(unsigned char)music_select].musicfn[0],music_select); playmusic(&map[(unsigned char)music_select].musicfn[0],music_select);
break; break;
case CON_ACTIVATECHEAT:
insptr++;
j=GetGameVarID(*(insptr++), g_i, g_p);
if (numplayers != 1 || !(g_player[myconnectindex].ps->gm & MODE_GAME))
{
OSD_Printf(CON_ERROR "CON_ACTIVATECHEAT: Not in a single-player game.\n");
break;
}
osdcmd_cheatsinfo_stat.cheatnum = j;
break;
case CON_GETTEXTURECEILING: case CON_GETTEXTURECEILING:
insptr++; insptr++;
SetGameVarID(g_iTextureID, sector[g_sp->sectnum].ceilingpicnum, g_i, g_p); SetGameVarID(g_iTextureID, sector[g_sp->sectnum].ceilingpicnum, g_i, g_p);