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

git-svn-id: https://svn.eduke32.com/eduke32@873 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-07-20 02:34:29 +00:00
parent 6d9579ed07
commit 6cf9c4767b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/gamedef.c
View file

@ -1838,7 +1838,7 @@ static int parsecommand(void)
textptr++; textptr++;
// get the ID of the DEF // get the ID of the DEF
// if (tw == CON_SETTHISPROJECTILE) if (tw == CON_SETTHISPROJECTILE)
labelsonly = 1; labelsonly = 1;
transvar(); transvar();
labelsonly = 0; labelsonly = 0;

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

@ -1167,7 +1167,7 @@ static void DoPlayer(int iSet, int lVar1, int lLabelID, int lVar2, int lParm2)
return; return;
} }
if (lParm2 < 0 || lParm2 >= playerlabels[lLabelID].maxParm2) if (playerlabels[lLabelID].flags & LABEL_HASPARM2 && (lParm2 < 0 || lParm2 >= playerlabels[lLabelID].maxParm2))
{ {
OSD_Printf(CON_ERROR "DoPlayer(): tried to %s invalid %s position %d on player (%d) from spr %d\n",line_num, OSD_Printf(CON_ERROR "DoPlayer(): tried to %s invalid %s position %d on player (%d) from spr %d\n",line_num,
iSet?"set":"get",playerlabels[lLabelID].name,lParm2,iPlayer,g_i); iSet?"set":"get",playerlabels[lLabelID].name,lParm2,iPlayer,g_i);
@ -2997,7 +2997,7 @@ static void DoActor(int iSet, int lVar1, int lLabelID, int lVar2, int lParm2)
return; return;
} }
if (lParm2 < 0 || lParm2 >= actorlabels[lLabelID].maxParm2) if (actorlabels[lLabelID].flags & LABEL_HASPARM2 && (lParm2 < 0 || lParm2 >= actorlabels[lLabelID].maxParm2))
{ {
OSD_Printf(CON_ERROR "DoActor(): tried to %s invalid %s position %d on sprite (%d) from spr %d\n",line_num, OSD_Printf(CON_ERROR "DoActor(): tried to %s invalid %s position %d on sprite (%d) from spr %d\n",line_num,
iSet?"set":"get",actorlabels[lLabelID].name,lParm2,iActor,g_i); iSet?"set":"get",actorlabels[lLabelID].name,lParm2,iActor,g_i);

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

@ -5048,7 +5048,7 @@ VOLUME_ALL_40x:
break; break;
} }
OnEvent(EVENT_DISPLAYMENUREST, g_player[screenpeek].ps->i, screenpeek, -1); OnEvent(EVENT_DISPLAYMENUREST, g_player[myconnectindex].ps->i, myconnectindex, -1);
if ((g_player[myconnectindex].ps->gm&MODE_MENU) != MODE_MENU) if ((g_player[myconnectindex].ps->gm&MODE_MENU) != MODE_MENU)
{ {