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

- fixed the reactor for good.

Browse source 
Fixes #70
This commit is contained in:
Christoph Oelckers 2020-08-01 09:55:48 +02:00
parent f75d30d858
commit 76ba45ac8d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/actors.cpp
View file

@ -1823,7 +1823,7 @@ void ooz(int i)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT) void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT, int REACTORSPARK, int REACTOR2SPARK)
{ {
spritetype* s = &sprite[i]; spritetype* s = &sprite[i];
auto t = &hittype[i].temp_data[0]; auto t = &hittype[i].temp_data[0];
@ -1850,7 +1850,7 @@ void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BUR
{ {
sprite[j].picnum = REACTOR2BURNT; sprite[j].picnum = REACTOR2BURNT;
} }
else if (sprite[j].picnum == REACTORBURNT || sprite[j].picnum == REACTOR2BURNT) else if (sprite[j].picnum == REACTORSPARK || sprite[j].picnum == REACTOR2SPARK)
{ {
sprite[j].cstat = (short)32768; sprite[j].cstat = (short)32768;
} }

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

@ -3264,7 +3264,7 @@ void moveactors_d(void)
case REACTOR: case REACTOR:
case REACTOR2: case REACTOR2:
reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT); reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT, REACTORSPARK, REACTOR2SPARK);
continue; continue;
case CAMERA1: case CAMERA1:

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

@ -3240,7 +3240,7 @@ void moveactors_r(void)
case REACTOR: case REACTOR:
case REACTOR2: case REACTOR2:
reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT); reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT, REACTORSPARK, REACTOR2SPARK);
continue; continue;
case CAMERA1: case CAMERA1:

2
source/games/duke/src/funct.h
View file

@ -46,7 +46,7 @@ bool queball(int i, int pocket, int queball, int stripeball);
void forcesphere(int i, int forcesphere); void forcesphere(int i, int forcesphere);
void recon(int i, int explosion, int firelaser, int attacksnd, int painsnd, int roamsnd, int shift, int (*getspawn)(int i)); void recon(int i, int explosion, int firelaser, int attacksnd, int painsnd, int roamsnd, int shift, int (*getspawn)(int i));
void ooz(int i); void ooz(int i);
void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT); void reactor(int i, int REACTOR, int REACTOR2, int REACTORBURNT, int REACTOR2BURNT, int REACTORSPARK, int REACTOR2SPARK);
void camera(int i); void camera(int i);
void forcesphere(int i); void forcesphere(int i);
void watersplash2(int i); void watersplash2(int i);