zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-01 14:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- parse - part 1.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-23 20:16:03 +02:00
parent 0fac102c26
commit 8bdeb66dcb
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/games/duke/src/gameexec.cpp
View file

@ -1500,6 +1500,7 @@ static bool ifcansee(DDukeActor* actor, int pnum)
int ParseState::parse(void) int ParseState::parse(void)
{ {
int j, l, s; int j, l, s;
auto g_sp = &g_ac->s;
if(killit_flag) return 1; if(killit_flag) return 1;
@ -1510,7 +1511,7 @@ int ParseState::parse(void)
insptr++; insptr++;
// HACK ALERT! The fire animation uses a broken ifrnd setup to delay its start because original CON has no variables. // HACK ALERT! The fire animation uses a broken ifrnd setup to delay its start because original CON has no variables.
// But the chosen random value of 16/255 is too low and can cause delays of a second or more. // But the chosen random value of 16/255 is too low and can cause delays of a second or more.
int spnum = sprite[g_i].picnum; int spnum = g_sp->picnum;
if (spnum == TILE_FIRE && g_t[4] == 0 && *insptr == 16) if (spnum == TILE_FIRE && g_t[4] == 0 && *insptr == 16)
{ {
parseifelse(rnd(64)); parseifelse(rnd(64));
@ -1523,18 +1524,18 @@ int ParseState::parse(void)
parseifelse(ifcanshoottarget(g_ac, g_p, g_x)); parseifelse(ifcanshoottarget(g_ac, g_p, g_x));
break; break;
case concmd_ifcanseetarget: case concmd_ifcanseetarget:
j = cansee(g_sp->x, g_sp->y, g_sp->z - ((krand() & 41) << 8), g_sp->sectnum, ps[g_p].posx, ps[g_p].posy, ps[g_p].posz/*-((krand()&41)<<8)*/, sprite[ps[g_p].i].sectnum); j = cansee(g_sp->x, g_sp->y, g_sp->z - ((krand() & 41) << 8), g_sp->sectnum, ps[g_p].posx, ps[g_p].posy, ps[g_p].posz/*-((krand()&41)<<8)*/, ps[g_p].GetActor()->s.sectnum);
parseifelse(j); parseifelse(j);
if (j) hittype[g_i].timetosleep = SLEEPTIME; if (j) g_ac->timetosleep = SLEEPTIME;
break; break;
case concmd_ifnocover: case concmd_ifnocover:
j = cansee(g_sp->x, g_sp->y, g_sp->z, g_sp->sectnum, ps[g_p].posx, ps[g_p].posy, ps[g_p].posz, sprite[ps[g_p].i].sectnum); j = cansee(g_sp->x, g_sp->y, g_sp->z, g_sp->sectnum, ps[g_p].posx, ps[g_p].posy, ps[g_p].posz, ps[g_p].GetActor()->s.sectnum);
parseifelse(j); parseifelse(j);
if (j) hittype[g_i].timetosleep = SLEEPTIME; if (j) g_ac->timetosleep = SLEEPTIME;
break; break;
case concmd_ifactornotstayput: case concmd_ifactornotstayput:
parseifelse(hittype[g_i].actorstayput == -1); parseifelse(g_ac->actorstayput == -1);
break; break;
case concmd_ifcansee: case concmd_ifcansee:
parseifelse(ifcansee(g_ac, g_p)); parseifelse(ifcansee(g_ac, g_p));
@ -1576,14 +1577,14 @@ int ParseState::parse(void)
case concmd_ifpdistl: case concmd_ifpdistl:
insptr++; insptr++;
parseifelse(g_x < *insptr); parseifelse(g_x < *insptr);
if (g_x > MAXSLEEPDIST && hittype[g_i].timetosleep == 0) if (g_x > MAXSLEEPDIST && g_ac->timetosleep == 0)
hittype[g_i].timetosleep = SLEEPTIME; g_ac->timetosleep = SLEEPTIME;
break; break;
case concmd_ifpdistg: case concmd_ifpdistg:
insptr++; insptr++;
parseifelse(g_x > * insptr); parseifelse(g_x > * insptr);
if (g_x > MAXSLEEPDIST && hittype[g_i].timetosleep == 0) if (g_x > MAXSLEEPDIST && g_ac->timetosleep == 0)
hittype[g_i].timetosleep = SLEEPTIME; g_ac->timetosleep = SLEEPTIME;
break; break;
case concmd_else: case concmd_else:
insptr = &ScriptCode[*(insptr + 1)]; insptr = &ScriptCode[*(insptr + 1)];
@ -1655,10 +1656,10 @@ int ParseState::parse(void)
{ {
banjosound = 273; banjosound = 273;
} }
S_PlayActorSound(banjosound, g_i, CHAN_WEAPON); S_PlayActorSound(banjosound, g_ac, CHAN_WEAPON);
} }
else if (!S_CheckSoundPlaying(g_i, banjosound)) else if (!S_CheckActorSoundPlaying(g_ac, banjosound))
S_PlayActorSound(banjosound, g_i, CHAN_WEAPON); S_PlayActorSound(banjosound, g_ac, CHAN_WEAPON);
insptr++; insptr++;
break; break;
case concmd_motoloopsnd: case concmd_motoloopsnd: