From 71213bf8bdd3130d27e3fcfaf67633215f5e900e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 23 Sep 2020 17:26:44 +0200 Subject: [PATCH] - added a missing code fragment for WT's lavapool. This made them float in the air instead of being on the ground. --- source/exhumed/src/player.cpp | 4 ---- source/games/duke/src/spawn_d.cpp | 12 ++++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source/exhumed/src/player.cpp b/source/exhumed/src/player.cpp index 54939f817..a7713c968 100644 --- a/source/exhumed/src/player.cpp +++ b/source/exhumed/src/player.cpp @@ -1279,10 +1279,6 @@ loc_1AB8E: uint16_t buttons = sPlayerInput[nPlayer].buttons; auto actions = sPlayerInput[nPlayer].actions; - if (actions & SB_OPEN) - { - int a = 0; - } // loc_1AEF5: if (PlayerList[nPlayer].nHealth > 0) diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp index 24a2a1298..d538db630 100644 --- a/source/games/duke/src/spawn_d.cpp +++ b/source/games/duke/src/spawn_d.cpp @@ -295,10 +295,18 @@ int spawn_d(int j, int pn) sp->shade = 127; } sp->cstat |= 32; + if (sp->picnum == LAVAPOOL) // Twentieth Anniversary World Tour + { + int fz = getflorzofslope(sp->sectnum, sp->x, sp->y); + if (fz != sp->z) + sp->z = fz; + sp->z -= 200; + } + case FECES: if( j >= 0) sp->xrepeat = sp->yrepeat = 1; - changespritestat(i,5); + changespritestat(i, STAT_MISC); break; case BLOODSPLAT1: @@ -312,7 +320,7 @@ int spawn_d(int j, int pn) if(j >= 0 && sprite[j].pal == 6) sp->pal = 6; insertspriteq(i); - changespritestat(i,5); + changespritestat(i, STAT_MISC); break; case TRIPBOMB: