mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@1045 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
ef3c5e6ad8
commit
9d390c4b3b
1 changed files with 30 additions and 2 deletions
|
@ -5590,20 +5590,48 @@ static int parse(void)
|
||||||
Bstrcpy(fta_quotes[i],fta_quotes[j]);
|
Bstrcpy(fta_quotes[i],fta_quotes[j]);
|
||||||
break;
|
break;
|
||||||
case CON_CHANGESPRITESTAT:
|
case CON_CHANGESPRITESTAT:
|
||||||
if ((i<0 || i>=MAXSPRITES) && checkCON) {OSD_Printf(CON_ERROR "Invalid sprite %d\n",line_num,keyw[g_tw],i);break;}
|
if ((i<0 || i>=MAXSPRITES) && checkCON)
|
||||||
if ((j<0 || j>=MAXSTATUS) && checkCON) {OSD_Printf(CON_ERROR "Invalid status %d\n",line_num,keyw[g_tw],j);break;}
|
{
|
||||||
|
OSD_Printf(CON_ERROR "Invalid sprite: %d\n",line_num,keyw[g_tw],i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if ((j<0 || j>=MAXSTATUS) && checkCON)
|
||||||
|
{
|
||||||
|
OSD_Printf(CON_ERROR "Invalid statnum: %d\n",line_num,keyw[g_tw],j);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (sprite[i].statnum == j) break;
|
||||||
/* initialize actor pointers when changing to an actor statnum because they usually
|
/* initialize actor pointers when changing to an actor statnum because they usually
|
||||||
have garbage left over from being handled as a hard coded object */
|
have garbage left over from being handled as a hard coded object */
|
||||||
|
|
||||||
if ((j == 1 || j == 2) && actorscrptr[sprite[i].picnum])
|
if ((j == 1 || j == 2) && actorscrptr[sprite[i].picnum])
|
||||||
{
|
{
|
||||||
T5 = *(actorscrptr[sprite[i].picnum]+1);
|
T5 = *(actorscrptr[sprite[i].picnum]+1);
|
||||||
T2 = *(actorscrptr[sprite[i].picnum]+2);
|
T2 = *(actorscrptr[sprite[i].picnum]+2);
|
||||||
sprite[i].hitag = *(actorscrptr[sprite[i].picnum]+3);
|
sprite[i].hitag = *(actorscrptr[sprite[i].picnum]+3);
|
||||||
|
hittype[i].lastvx = 0;
|
||||||
|
hittype[i].lastvy = 0;
|
||||||
|
hittype[i].timetosleep = 0;
|
||||||
|
hittype[i].cgg = 0;
|
||||||
|
hittype[i].movflag = 0;
|
||||||
|
hittype[i].tempang = 0;
|
||||||
|
hittype[i].dispicnum = 0;
|
||||||
|
T1=T3=T4=T6=T7=T8=T9=0;
|
||||||
|
hittype[i].flags = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
T2=T5=0;
|
T2=T5=0;
|
||||||
sprite[i].hitag = 0;
|
sprite[i].hitag = 0;
|
||||||
|
hittype[i].lastvx = 0;
|
||||||
|
hittype[i].lastvy = 0;
|
||||||
|
hittype[i].timetosleep = 0;
|
||||||
|
hittype[i].cgg = 0;
|
||||||
|
hittype[i].movflag = 0;
|
||||||
|
hittype[i].tempang = 0;
|
||||||
|
hittype[i].dispicnum = 0;
|
||||||
|
T1=T3=T4=T6=T7=T8=T9=0;
|
||||||
|
hittype[i].flags = 0;
|
||||||
}
|
}
|
||||||
changespritestat(i,j);
|
changespritestat(i,j);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue