From dfb18ef9a9d630f6cb04a2280889d712f248a3cf Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 25 Jul 2021 12:43:03 +0200 Subject: [PATCH] - Duke/RR: Call Bowling lane reset code only when playing RR. This may alter some tile references which will cause problems with hires replacements in Duke . --- source/core/textures/hightile.cpp | 5 ----- source/games/duke/src/bowling.cpp | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/core/textures/hightile.cpp b/source/core/textures/hightile.cpp index 65d4161ce..5ccef8957 100644 --- a/source/core/textures/hightile.cpp +++ b/source/core/textures/hightile.cpp @@ -329,11 +329,6 @@ bool PickTexture(FGameTexture* tex, int paletteid, TexturePick& pick, bool wanti { if (!tex->isValid() || tex->GetTexelWidth() <= 0 || tex->GetTexelHeight() <= 0) return false; - if (tex->GetUseType() == ETextureType::FontChar && paletteid != 0) - { - int a = 0; - } - int usepalette = 0, useremap = 0; if (!IsLuminosityTranslation(paletteid)) { diff --git a/source/games/duke/src/bowling.cpp b/source/games/duke/src/bowling.cpp index a8e9f1782..81efcd4cd 100644 --- a/source/games/duke/src/bowling.cpp +++ b/source/games/duke/src/bowling.cpp @@ -254,6 +254,7 @@ void resetpins(short sect) void resetlanepics(void) { + if (!isRR()) return; int x, y; short i; short tag, pic;