From 9c40c2f6afbc9778f4d482d3bff2a3e351b82213 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 12 Aug 2020 22:52:41 +0200 Subject: [PATCH] - don't draw screenblends when not in a 3D view. Fixed #174. --- source/build/src/engine.cpp | 3 ++- source/games/duke/src/savegame.cpp | 1 - source/games/duke/src/types.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 624fe2b26..efd1cc418 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -27,6 +27,7 @@ #include "menu.h" #include "version.h" #include "earcut.hpp" +#include "gamestate.h" #ifdef USE_OPENGL # include "mdsprite.h" @@ -2999,7 +3000,7 @@ void videoNextPage(void) M_Drawer(); // Handle the final 2D overlays. - DrawFullscreenBlends(); + if (gamestate == GS_LEVEL) DrawFullscreenBlends(); DrawRateStuff(); if (in3dmode()) diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp index 86bae4d6f..b07719d3a 100644 --- a/source/games/duke/src/savegame.cpp +++ b/source/games/duke/src/savegame.cpp @@ -144,7 +144,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w, ("visibility", w.visibility) ("bobcounter", w.bobcounter) ("weapon_sway", w.weapon_sway) - ("pals_time", w.pals_time) ("randomflamex", w.randomflamex) ("crack_time", w.crack_time) ("aim.mode", w.aim_mode) diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 559d277ea..df49aa1a8 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -134,7 +134,7 @@ struct player_struct int posxv, posyv, poszv, last_pissed_time, truefz, truecz; int player_par, visibility; int bobcounter; - int pals_time, randomflamex, crack_time; + int randomflamex, crack_time; int aim_mode, auto_aim, ftt;