zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- RRRA: fixed vehicle collision with psychedelic cactuses.

Browse source 
This did not fully match the original source which had a critical difference here between RR and RRRA.
This commit is contained in:
Christoph Oelckers 2020-11-05 07:30:56 +01:00
parent 977223287e
commit d5ff87fa4f
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
source/games/duke/src/player_r.cpp
View file

@ -3971,34 +3971,39 @@ HORIZONLY:
{ {
onBoatHit(snum, clip.actor); onBoatHit(snum, clip.actor);
} }
else else if (badguy(clip.actor))
if (badguy(clip.actor)) {
if (clip.actor->s.statnum != 1)
{ {
if (clip.actor->s.statnum != 1) clip.actor->timetosleep = 0;
{ if (clip.actor->s.picnum == BILLYRAY)
clip.actor->timetosleep = 0; S_PlayActorSound(404, clip.actor);
if (clip.actor->s.picnum == BILLYRAY) else
S_PlayActorSound(404, clip.actor); check_fta_sounds_r(clip.actor);
else changespritestat(clip.actor, 1);
check_fta_sounds_r(clip.actor);
changespritestat(clip.actor, 1);
}
} }
else }
if (clip.actor->s.picnum == RRTILE3410) else if (!isRRRA() && clip.actor->s.picnum == RRTILE3410)
{ {
quickkill(p); quickkill(p);
S_PlayActorSound(446, pact); S_PlayActorSound(446, pact);
} }
else if (isRRRA() && clip.actor->s.picnum == RRTILE2443 && clip.actor->s.pal == 19) if (isRRRA())
{ {
clip.actor->s.pal = 0; if (clip.actor->s.picnum == RRTILE3410)
p->DrugMode = 5; {
ps[snum].GetActor()->s.extra = max_player_health; quickkill(p);
} S_PlayActorSound(446, pact);
}
else if (clip.actor->s.picnum == RRTILE2443 && clip.actor->s.pal == 19)
{
clip.actor->s.pal = 0;
p->DrugMode = 5;
ps[snum].GetActor()->s.extra = max_player_health;
}
}
} }
if (p->jetpack_on == 0) if (p->jetpack_on == 0)
{ {
if (s->xvel > 16) if (s->xvel > 16)