From 53cf248269dc9a368d5ce9caa945bd8b43af4417 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 15 Aug 2020 10:25:30 +0200 Subject: [PATCH] - added a few missing World Tour bits. Looks like GDX missed the redefined new types of the old bosses. Also guard the commentary sprites by a CVAR. --- source/games/duke/src/animatesprites_d.cpp | 4 +++- source/games/duke/src/flags_d.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/games/duke/src/animatesprites_d.cpp b/source/games/duke/src/animatesprites_d.cpp index a3e221525..2e3cc1ef3 100644 --- a/source/games/duke/src/animatesprites_d.cpp +++ b/source/games/duke/src/animatesprites_d.cpp @@ -38,6 +38,8 @@ source as it is released. #include "prediction.h" #include "names_d.h" +CVAR(Bool, dukewt_commentary, false, CVAR_ARCHIVE) + BEGIN_DUKE_NS void animatesprites_d(int x,int y,int a,int smoothratio) @@ -58,7 +60,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio) { case DEVELOPERCOMMENTARY: case DEVELOPERCOMMENTARY + 1: - if(!isWorldTour() /* || !cfg.bDevCommentry)*/) + if(!isWorldTour() || !dukewt_commentary) t->xrepeat = t->yrepeat = 0; break; case BLOODPOOL: diff --git a/source/games/duke/src/flags_d.cpp b/source/games/duke/src/flags_d.cpp index 8e81d3f67..85682bf7a 100644 --- a/source/games/duke/src/flags_d.cpp +++ b/source/games/duke/src/flags_d.cpp @@ -86,7 +86,8 @@ void initactorflags_d() if (isWorldTour()) { - setflag(SFLAG_INTERNAL_BADGUY|SFLAG_NODAMAGEPUSH, { FIREFLY, BOSS5, BOSS5STAYPUT }); + setflag(SFLAG_INTERNAL_BADGUY, { FIREFLY }); + setflag(SFLAG_INTERNAL_BADGUY|SFLAG_NODAMAGEPUSH, { BOSS5, BOSS5STAYPUT, BOSS2STAYPUT, BOSS3STAYPUT }); } settileflag(TFLAG_WALLSWITCH, {