From 58d354ea6e7a427a7749a96044a4cd1585b54cbe Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Sat, 4 Jul 2020 20:04:48 -0700 Subject: [PATCH] Fix for crash related to the power bar rendering with the fading table. --- code/redalert/power.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/redalert/power.cpp b/code/redalert/power.cpp index a7c0245..4a7b985 100644 --- a/code/redalert/power.cpp +++ b/code/redalert/power.cpp @@ -202,19 +202,19 @@ void PowerClass::Draw_It(bool complete) /* ** Hires power strip is too big to fit into a shape so it is in two parts */ - CC_DrawHD_Shape(PowerBarShapeHD[0], 0, ScreenWidth - (640 - (240 * RESFACTOR)), (88 * RESFACTOR), WINDOW_MAIN, flags | SHAPE_NORMAL | SHAPE_WIN_REL, remap); + CC_DrawHD_Shape(PowerBarShapeHD[0], 0, ScreenWidth - (640 - (240 * RESFACTOR)), (88 * RESFACTOR), WINDOW_MAIN, SHAPE_NORMAL | SHAPE_WIN_REL, remap); int bottomOfBar = (88 + 56) * RESFACTOR; while ( bottomOfBar < ( PowerButton.Height - 56 ) ) { - CC_DrawHD_Shape(PowerBarShapeHD[1], 0, ScreenWidth - (640 - (240 * RESFACTOR)), bottomOfBar, WINDOW_MAIN, flags | SHAPE_NORMAL | SHAPE_WIN_REL, remap); + CC_DrawHD_Shape(PowerBarShapeHD[1], 0, ScreenWidth - (640 - (240 * RESFACTOR)), bottomOfBar, WINDOW_MAIN, SHAPE_NORMAL | SHAPE_WIN_REL, remap); bottomOfBar += 56 * RESFACTOR; } // bottom - CC_DrawHD_Shape(PowerBarShapeHD[2], 0, ScreenWidth - (640 - (240 * RESFACTOR)), bottomOfBar, WINDOW_MAIN, flags | SHAPE_NORMAL | SHAPE_WIN_REL, remap); + CC_DrawHD_Shape(PowerBarShapeHD[2], 0, ScreenWidth - (640 - (240 * RESFACTOR)), bottomOfBar, WINDOW_MAIN, SHAPE_NORMAL | SHAPE_WIN_REL, remap); int bottom = bottomOfBar + (36 * RESFACTOR);