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

More CON error messages

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@951 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hnt_ts 2008-08-09 10:43:27 +00:00
parent ca0987d715
commit ae32f428cd
1 changed files with 75 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4768,6 +4768,12 @@ static int parse(void)
case CON_MIKESND: case CON_MIKESND:
insptr++; insptr++;
if (g_sp->yvel<0 || g_sp->yvel>=MAXSOUNDS)
{
OSD_Printf(CON_ERROR "CON_MIKESND: Invalid sound %d\n",line_num,g_sp->yvel);
insptr++;
break;
}
if (!isspritemakingsound(g_i,g_sp->yvel)) if (!isspritemakingsound(g_i,g_sp->yvel))
spritesound(g_sp->yvel,g_i); spritesound(g_sp->yvel,g_i);
break; break;
@ -5171,7 +5177,7 @@ static int parse(void)
operatesectors(var1, var2); operatesectors(var1, var2);
break; break;
case CON_OPERATEACTIVATORS: case CON_OPERATEACTIVATORS:
if (var1<0 || var1>=0xffff) {OSD_Printf(CON_ERROR "CON_OPERATEACTIVATORS: Invalid sector %d\n",line_num,var1);break;} if (var2<0 || var2>=ud.multimode) {OSD_Printf(CON_ERROR "CON_OPERATEACTIVATORS: Invalid player %d\n",line_num,var2);break;}
operateactivators(var1, var2); operateactivators(var1, var2);
break; break;
case CON_SETASPECT: case CON_SETASPECT:
@ -5342,15 +5348,15 @@ static int parse(void)
break; break;
} }
case CON_GETPNAME: case CON_GETPNAME:
case CON_QSTRCAT: case CON_QSTRCAT:
case CON_QSTRCPY: case CON_QSTRCPY:
case CON_QGETSYSSTR: case CON_QGETSYSSTR:
case CON_CHANGESPRITESTAT: case CON_CHANGESPRITESTAT:
case CON_CHANGESPRITESECT: case CON_CHANGESPRITESECT:
insptr++; insptr++;
{ {
int i = GetGameVarID(*insptr++, g_i, g_p), j; int i = GetGameVarID(*insptr++, g_i, g_p), j;
if (tw == CON_GETPNAME && *insptr == g_iThisActorID) if (tw == CON_GETPNAME && *insptr == g_iThisActorID)
{ {
j = g_p; j = g_p;
@ -5778,8 +5784,10 @@ case CON_CHANGESPRITESECT:
insptr++; insptr++;
{ {
j=GetGameVarID(*insptr++, g_i, g_p); j=GetGameVarID(*insptr++, g_i, g_p);
if (j < MAXUNIQHUDID-1) if (j >= 0 && j < MAXUNIQHUDID-1)
guniqhudid = j; guniqhudid = j;
else
OSD_Printf(CON_ERROR "CON_GUNIQHUDID: Invalid ID %d\n",line_num,j);
break; break;
} }
@ -5826,7 +5834,15 @@ case CON_CHANGESPRITESECT:
if (y1 > y2) swaplong(&y1,&y2); if (y1 > y2) swaplong(&y1,&y2);
if (x1 < 0 || y1 < 0 || x2 > xdim-1 || y2 > ydim-1 || x2-x1 < 2 || y2-y1 < 2) if (x1 < 0 || y1 < 0 || x2 > xdim-1 || y2 > ydim-1 || x2-x1 < 2 || y2-y1 < 2)
{
OSD_Printf(CON_ERROR "CON_SHOWVIEW: incorrect coordiantes\n",line_num);
break; break;
}
if (sect<0 || sect>=numsectors)
{
OSD_Printf(CON_ERROR "CON_SHOWVIEW: Invalid sector %d\n",line_num,sect);
break;
}
#if defined(USE_OPENGL) && defined(POLYMOST) #if defined(USE_OPENGL) && defined(POLYMOST)
j = glprojectionhacks; j = glprojectionhacks;
@ -5973,6 +5989,11 @@ case CON_CHANGESPRITESECT:
int walldist=GetGameVarID(*insptr++,g_i,g_p), clipmask=GetGameVarID(*insptr++,g_i,g_p); int walldist=GetGameVarID(*insptr++,g_i,g_p), clipmask=GetGameVarID(*insptr++,g_i,g_p);
int ceilz, ceilhit, florz, florhit; int ceilz, ceilhit, florz, florhit;
if (sectnum<0 || sectnum>=numsectors)
{
OSD_Printf(CON_ERROR "CON_GETZRANGE: Invalid sector %d\n",line_num,sectnum);
break;
}
getzrange(x, y, z, sectnum, &ceilz, &ceilhit, &florz, &florhit, walldist, clipmask); getzrange(x, y, z, sectnum, &ceilz, &ceilhit, &florz, &florhit, walldist, clipmask);
SetGameVarID(ceilzvar, ceilz, g_i, g_p); SetGameVarID(ceilzvar, ceilz, g_i, g_p);
SetGameVarID(ceilhitvar, ceilhit, g_i, g_p); SetGameVarID(ceilhitvar, ceilhit, g_i, g_p);
@ -5992,6 +6013,11 @@ case CON_CHANGESPRITESECT:
short hitsect, hitwall, hitsprite; short hitsect, hitwall, hitsprite;
int hitx, hity, hitz; int hitx, hity, hitz;
if (sectnum<0 || sectnum>=numsectors)
{
OSD_Printf(CON_ERROR "CON_HITSCAN: Invalid sector %d\n",line_num,sectnum);
break;
}
hitscan(xs, ys, zs, sectnum, vx, vy, vz, &hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, cliptype); hitscan(xs, ys, zs, sectnum, vx, vy, vz, &hitsect, &hitwall, &hitsprite, &hitx, &hity, &hitz, cliptype);
SetGameVarID(hitsectvar, hitsect, g_i, g_p); SetGameVarID(hitsectvar, hitsect, g_i, g_p);
SetGameVarID(hitwallvar, hitwall, g_i, g_p); SetGameVarID(hitwallvar, hitwall, g_i, g_p);
@ -6050,6 +6076,11 @@ case CON_CHANGESPRITESECT:
int neartagsectorvar=*insptr++, neartagwallvar=*insptr++, neartagspritevar=*insptr++, neartaghitdistvar=*insptr++; int neartagsectorvar=*insptr++, neartagwallvar=*insptr++, neartagspritevar=*insptr++, neartaghitdistvar=*insptr++;
int neartagrange=GetGameVarID(*insptr++,g_i,g_p), tagsearch=GetGameVarID(*insptr++,g_i,g_p); int neartagrange=GetGameVarID(*insptr++,g_i,g_p), tagsearch=GetGameVarID(*insptr++,g_i,g_p);
if (sectnum<0 || sectnum>=numsectors)
{
OSD_Printf(CON_ERROR "CON_NEARTAG: Invalid sector %d\n",line_num,sectnum);
break;
}
neartag(x, y, z, sectnum, ang, &neartagsector, &neartagwall, &neartagsprite, &neartaghitdist, neartagrange, tagsearch); neartag(x, y, z, sectnum, ang, &neartagsector, &neartagwall, &neartagsprite, &neartaghitdist, neartagrange, tagsearch);
SetGameVarID(neartagsectorvar, neartagsector, g_i, g_p); SetGameVarID(neartagsectorvar, neartagsector, g_i, g_p);
@ -6068,13 +6099,22 @@ case CON_CHANGESPRITESECT:
if (tw == CON_SETSPRITE) if (tw == CON_SETSPRITE)
{ {
setsprite(spritenum, x, y, z); if (spritenum >= 0 && spritenum < MAXSPRITES)
setsprite(spritenum, x, y, z);
else
OSD_Printf(CON_ERROR "CON_SETSPRITE: invalid sprite ID %d\n",line_num,spritenum);
break; break;
} }
{ {
int cliptype = GetGameVarID(*insptr++,g_i,g_p); int cliptype = GetGameVarID(*insptr++,g_i,g_p);
if (spritenum < 0 && spritenum >= MAXSPRITES)
{
OSD_Printf(CON_ERROR "CON_MOVESPRITE: invalid sprite ID %d\n",line_num,spritenum);
insptr++;
break;
}
SetGameVarID(*insptr++, movesprite(spritenum, x, y, z, cliptype), g_i, g_p); SetGameVarID(*insptr++, movesprite(spritenum, x, y, z, cliptype), g_i, g_p);
break; break;
} }
@ -6524,7 +6564,7 @@ case CON_CHANGESPRITESECT:
case CON_CLEARMAPSTATE: case CON_CLEARMAPSTATE:
insptr++; insptr++;
j = GetGameVarID(*insptr++,g_i,g_p); j = GetGameVarID(*insptr++,g_i,g_p);
if (j < 0 || j > MAXVOLUMES*MAXLEVELS) if (j < 0 || j >= MAXVOLUMES*MAXLEVELS)
{ {
OSD_Printf(CON_ERROR "CON_CLEARMAPSTATE: Invalid map number: %d\n",line_num,j); OSD_Printf(CON_ERROR "CON_CLEARMAPSTATE: Invalid map number: %d\n",line_num,j);
return 0; return 0;
@ -7010,7 +7050,10 @@ case CON_CHANGESPRITESECT:
if (tw == CON_SETACTORVAR) if (tw == CON_SETACTORVAR)
{ {
SetGameVarID(lVar1, GetGameVarID(j, g_i, g_p), lSprite, g_p); if (lSprite >= 0 && lSprite < MAXSPRITES)
SetGameVarID(lVar1, GetGameVarID(j, g_i, g_p), lSprite, g_p);
else
OSD_Printf(CON_ERROR "CON_SETACTORVAR: invalid sprite ID %d\n",line_num,lSprite);
break; break;
} }
SetGameVarID(j, GetGameVarID(lVar1, lSprite, g_p), g_i, g_p); SetGameVarID(j, GetGameVarID(lVar1, lSprite, g_p), g_i, g_p);
@ -7033,7 +7076,10 @@ case CON_CHANGESPRITESECT:
if (tw == CON_SETPLAYERVAR) if (tw == CON_SETPLAYERVAR)
{ {
SetGameVarID(lVar1, GetGameVarID(lVar2, g_i, g_p), g_i, iPlayer); if (iPlayer >= 0 && iPlayer < ud.multimode)
SetGameVarID(lVar1, GetGameVarID(lVar2, g_i, g_p), g_i, iPlayer);
else
OSD_Printf(CON_ERROR "CON_SETPLAYERVAR: invalid player ID %d\n",line_num,iPlayer);
break; break;
} }
SetGameVarID(lVar2, GetGameVarID(lVar1, g_i, iPlayer), g_i, g_p); SetGameVarID(lVar2, GetGameVarID(lVar1, g_i, iPlayer), g_i, g_p);
@ -7243,6 +7289,12 @@ case CON_CHANGESPRITESECT:
case CON_GMAXAMMO: case CON_GMAXAMMO:
insptr++; insptr++;
j=GetGameVarID(*insptr++, g_i, g_p); j=GetGameVarID(*insptr++, g_i, g_p);
if (j<0 || j>=MAX_WEAPONS)
{
OSD_Printf(CON_ERROR "CON_GMAXAMMO: Invalid weapon ID %d\n",line_num,j);
insptr++;
break;
}
SetGameVarID(*insptr++, g_player[g_p].ps->max_ammo_amount[j], g_i, g_p); SetGameVarID(*insptr++, g_player[g_p].ps->max_ammo_amount[j], g_i, g_p);
break; break;
@ -7250,6 +7302,12 @@ case CON_CHANGESPRITESECT:
insptr++; insptr++;
j=GetGameVarID(*insptr++, g_i, g_p); j=GetGameVarID(*insptr++, g_i, g_p);
g_player[g_p].ps->max_ammo_amount[j]=GetGameVarID(*insptr++, g_i, g_p); g_player[g_p].ps->max_ammo_amount[j]=GetGameVarID(*insptr++, g_i, g_p);
if (j<0 || j>=MAX_WEAPONS)
{
OSD_Printf(CON_ERROR "CON_SMAXAMMO: Invalid weapon ID %d\n",line_num,j);
insptr++;
break;
}
break; break;
case CON_MULVARVAR: case CON_MULVARVAR:
@ -7545,6 +7603,8 @@ case CON_CHANGESPRITESECT:
case GET_BOOTS: case GET_BOOTS:
if (g_player[g_p].ps->boot_amount != *insptr) j = 1; if (g_player[g_p].ps->boot_amount != *insptr) j = 1;
break; break;
default:
OSD_Printf(CON_ERROR "CON_IFPINVENTORY: invalid inventory ID\n",line_num);
} }
parseifelse(j); parseifelse(j);