From 76ba45ac8d1166f6f3dbdd357a9db50c62d1795a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 1 Aug 2020 09:55:48 +0200 Subject: [PATCH] - fixed the reactor for good. Fixes #70 --- source/games/duke/src/actors.cpp | 4 ++-- source/games/duke/src/actors_d.cpp | 2 +- source/games/duke/src/actors_r.cpp | 2 +- source/games/duke/src/funct.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index d33340e41..cc2962810 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -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]; 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; } - 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; } diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 4755ffb47..5d396e672 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -3264,7 +3264,7 @@ void moveactors_d(void) case REACTOR: case REACTOR2: - reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT); + reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT, REACTORSPARK, REACTOR2SPARK); continue; case CAMERA1: diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 548233c8f..4a50d473c 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -3240,7 +3240,7 @@ void moveactors_r(void) case REACTOR: case REACTOR2: - reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT); + reactor(i, REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT, REACTORSPARK, REACTOR2SPARK); continue; case CAMERA1: diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h index c5040e802..f9cb3511f 100644 --- a/source/games/duke/src/funct.h +++ b/source/games/duke/src/funct.h @@ -46,7 +46,7 @@ bool queball(int i, int pocket, int queball, int stripeball); 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 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 forcesphere(int i); void watersplash2(int i);