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

- Duke underwater.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-25 07:01:58 +01:00
parent b302f2535f
commit 70e1b87160
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/duke/src/player_d.cpp
View file

@ -1909,7 +1909,7 @@ static void underwater(int snum, ESyncBits actions, int psect, int fz, int cz)
{ {
int j; int j;
auto p = &ps[snum]; auto p = &ps[snum];
int pi = p->i; auto pact = p->GetActor();
int psectlotag = sector[psect].lotag; int psectlotag = sector[psect].lotag;
// under water // under water
@ -1919,8 +1919,8 @@ static void underwater(int snum, ESyncBits actions, int psect, int fz, int cz)
p->pycount &= 2047; p->pycount &= 2047;
p->pyoff = sintable[p->pycount] >> 7; p->pyoff = sintable[p->pycount] >> 7;
if (!S_CheckActorSoundPlaying(pi, DUKE_UNDERWATER)) if (!S_CheckActorSoundPlaying(pact, DUKE_UNDERWATER))
S_PlayActorSound(DUKE_UNDERWATER, pi); S_PlayActorSound(DUKE_UNDERWATER, pact);
if (actions & SB_JUMP) if (actions & SB_JUMP)
{ {
@ -1969,14 +1969,14 @@ static void underwater(int snum, ESyncBits actions, int psect, int fz, int cz)
if (p->scuba_on && (krand() & 255) < 8) if (p->scuba_on && (krand() & 255) < 8)
{ {
j = fi.spawn(pi, WATERBUBBLE); auto j = spawn(pact, WATERBUBBLE);
sprite[j].x += j->s.x +=
sintable[(p->angle.ang.asbuild() + 512 + 64 - (global_random & 128)) & 2047] >> 6; sintable[(p->angle.ang.asbuild() + 512 + 64 - (global_random & 128)) & 2047] >> 6;
sprite[j].y += j->s.y +=
sintable[(p->angle.ang.asbuild() + 64 - (global_random & 128)) & 2047] >> 6; sintable[(p->angle.ang.asbuild() + 64 - (global_random & 128)) & 2047] >> 6;
sprite[j].xrepeat = 3; j->s.xrepeat = 3;
sprite[j].yrepeat = 2; j->s.yrepeat = 2;
sprite[j].z = p->posz + (8 << 8); j->s.z = p->posz + (8 << 8);
} }
} }