zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-06 22:00:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- move*bolt.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-22 19:46:42 +02:00
parent dc75037d01
commit 1af39eb29d
2 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/games/duke/src/actors_d.cpp
View file

@ -1319,14 +1319,14 @@ static void moveviewscreen(DDukeActor* actor)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void movesidebolt(int i) static void movesidebolt(DDukeActor* actor)
{ {
auto s = &sprite[i]; auto s = &actor->s;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
int x; int x;
int sect = s->sectnum; int sect = s->sectnum;
auto p = findplayer(s, &x); auto p = findplayer(&actor->s, &x);
if (x > 20480) return; if (x > 20480) return;
CLEAR_THE_BOLT2: CLEAR_THE_BOLT2:
@ -1350,13 +1350,8 @@ CLEAR_THE_BOLT2:
} }
s->picnum++; s->picnum++;
#if 0
// content of l was undefined.
if (l & 1) s->cstat ^= 2;
#endif
if ((krand() & 1) && sector[sect].floorpicnum == HURTRAIL) if ((krand() & 1) && sector[sect].floorpicnum == HURTRAIL)
S_PlayActorSound(SHORT_CIRCUIT, i); S_PlayActorSound(SHORT_CIRCUIT, actor);
if (s->picnum == SIDEBOLT1 + 4) s->picnum = SIDEBOLT1; if (s->picnum == SIDEBOLT1 + 4) s->picnum = SIDEBOLT1;
} }
@ -1367,14 +1362,14 @@ CLEAR_THE_BOLT2:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void movebolt(int i) static void movebolt(DDukeActor *actor)
{ {
auto s = &sprite[i]; auto s = &actor->s;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
int x; int x;
int sect = s->sectnum; int sect = s->sectnum;
auto p = findplayer(s, &x); auto p = findplayer(&actor->s, &x);
if (x > 20480) return; if (x > 20480) return;
if (t[3] == 0) if (t[3] == 0)
@ -1409,7 +1404,7 @@ CLEAR_THE_BOLT:
if (l & 1) s->cstat ^= 2; if (l & 1) s->cstat ^= 2;
if (s->picnum == (BOLT1+1) && (krand()&7) == 0 && sector[sect].floorpicnum == HURTRAIL) if (s->picnum == (BOLT1+1) && (krand()&7) == 0 && sector[sect].floorpicnum == HURTRAIL)
S_PlayActorSound(SHORT_CIRCUIT,i); S_PlayActorSound(SHORT_CIRCUIT,actor);
if (s->picnum==BOLT1+4) s->picnum=BOLT1; if (s->picnum==BOLT1+4) s->picnum=BOLT1;
@ -1503,12 +1498,12 @@ void movestandables_d(void)
else if (picnum >= SIDEBOLT1 && picnum <= SIDEBOLT1 + 3) else if (picnum >= SIDEBOLT1 && picnum <= SIDEBOLT1 + 3)
{ {
movesidebolt(i); movesidebolt(&hittype[i]);
} }
else if (picnum >= BOLT1 && picnum <= BOLT1 + 3) else if (picnum >= BOLT1 && picnum <= BOLT1 + 3)
{ {
movebolt(i); movebolt(&hittype[i]);
} }
else if (picnum == WATERDRIP) else if (picnum == WATERDRIP)

12
source/games/duke/src/actors_r.cpp
View file

@ -933,14 +933,14 @@ static void movecrack(DDukeActor* actor)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void movebolt(int i) static void movebolt(DDukeActor* actor)
{ {
auto s = &sprite[i]; auto s = &actor->s;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
int x; int x;
int sect = s->sectnum; int sect = s->sectnum;
auto p = findplayer(s, &x); auto p = findplayer(&actor->s, &x);
if (x > 20480) return; if (x > 20480) return;
if (t[3] == 0) if (t[3] == 0)
@ -975,7 +975,7 @@ CLEAR_THE_BOLT:
if (l & 1) s->cstat ^= 2; if (l & 1) s->cstat ^= 2;
if (s->picnum == (BOLT1 + 1) && (krand() & 1) && sector[sect].floorpicnum == HURTRAIL) if (s->picnum == (BOLT1 + 1) && (krand() & 1) && sector[sect].floorpicnum == HURTRAIL)
S_PlayActorSound(SHORT_CIRCUIT, i); S_PlayActorSound(SHORT_CIRCUIT, actor);
if (s->picnum == BOLT1 + 4) s->picnum = BOLT1; if (s->picnum == BOLT1 + 4) s->picnum = BOLT1;
@ -1055,7 +1055,7 @@ void movestandables_r(void)
else if (picnum >= BOLT1 && picnum <= BOLT1 + 3) else if (picnum >= BOLT1 && picnum <= BOLT1 + 3)
{ {
movebolt(i); movebolt(&hittype[i]);
} }
else if (picnum == WATERDRIP) else if (picnum == WATERDRIP)