Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 872 → Rev 873

/polymer/eduke32/source/gamedef.c
1838,7 → 1838,7
textptr++;
 
// get the ID of the DEF
// if (tw == CON_SETTHISPROJECTILE)
if (tw == CON_SETTHISPROJECTILE)
labelsonly = 1;
transvar();
labelsonly = 0;
/polymer/eduke32/source/gameexec.c
1167,7 → 1167,7
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,
iSet?"set":"get",playerlabels[lLabelID].name,lParm2,iPlayer,g_i);
2997,7 → 2997,7
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,
iSet?"set":"get",actorlabels[lLabelID].name,lParm2,iActor,g_i);
/polymer/eduke32/source/menus.c
5048,7 → 5048,7
 
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)
{