From 706d465781b032104d406be97a0be6228d7a1e6a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 8 Nov 2022 11:46:13 +0100 Subject: [PATCH] - removed the unused BaseBlend* variables and the testblend CCMD. When this was still working it was software rendering only anyway so no real loss here. --- src/r_data/v_palette.cpp | 32 -------------------------- src/rendering/r_utility.cpp | 12 ---------- src/rendering/swrenderer/r_swscene.cpp | 6 ----- src/st_stuff.h | 4 ---- 4 files changed, 54 deletions(-) diff --git a/src/r_data/v_palette.cpp b/src/r_data/v_palette.cpp index 74473d5a5..aa3702bea 100644 --- a/src/r_data/v_palette.cpp +++ b/src/r_data/v_palette.cpp @@ -84,35 +84,3 @@ void InitPalette () } -CCMD (testblend) -{ - FString colorstring; - int color; - float amt; - - if (argv.argc() < 3) - { - Printf ("testblend \n"); - } - else - { - if ( !(colorstring = V_GetColorStringByName (argv[1])).IsEmpty() ) - { - color = V_GetColorFromString (colorstring); - } - else - { - color = V_GetColorFromString (argv[1]); - } - amt = (float)atof (argv[2]); - if (amt > 1.0f) - amt = 1.0f; - else if (amt < 0.0f) - amt = 0.0f; - BaseBlendR = RPART(color); - BaseBlendG = GPART(color); - BaseBlendB = BPART(color); - BaseBlendA = amt; - } -} - diff --git a/src/rendering/r_utility.cpp b/src/rendering/r_utility.cpp index c87db0e26..c3f3d3b52 100644 --- a/src/rendering/r_utility.cpp +++ b/src/rendering/r_utility.cpp @@ -1058,18 +1058,6 @@ void R_SetupFrame (FRenderViewpoint &viewpoint, FViewWindow &viewwindow, AActor if (R_OldBlend != newblend) { R_OldBlend = newblend; - if (APART(newblend)) - { - BaseBlendR = RPART(newblend); - BaseBlendG = GPART(newblend); - BaseBlendB = BPART(newblend); - BaseBlendA = APART(newblend) / 255.f; - } - else - { - BaseBlendR = BaseBlendG = BaseBlendB = 0; - BaseBlendA = 0.f; - } } validcount++; diff --git a/src/rendering/swrenderer/r_swscene.cpp b/src/rendering/swrenderer/r_swscene.cpp index f6c58a807..491370dfc 100644 --- a/src/rendering/swrenderer/r_swscene.cpp +++ b/src/rendering/swrenderer/r_swscene.cpp @@ -39,12 +39,6 @@ #include "d_main.h" #include "v_draw.h" -// [RH] Base blending values (for e.g. underwater) -int BaseBlendR, BaseBlendG, BaseBlendB; -float BaseBlendA; - - - class FSWPaletteTexture : public FImageSource { public: diff --git a/src/st_stuff.h b/src/st_stuff.h index cb4098804..fed2dc796 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -5,8 +5,4 @@ struct event_t; bool ST_Responder(event_t* ev); -// [RH] Base blending values (for e.g. underwater) -extern int BaseBlendR, BaseBlendG, BaseBlendB; -extern float BaseBlendA; - #endif