From d983592f2edcc562b279beb96d2c307de9080ad7 Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Wed, 5 Aug 2020 13:36:11 -0700 Subject: [PATCH] Fixed a bug were nonremappable buildings were getting team colors assigned. --- code/redalert/building.cpp | 5 +++++ code/redalert/conquer.cpp | 6 +++--- code/redalert/techno.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/redalert/building.cpp b/code/redalert/building.cpp index f8ea390..f90f66c 100644 --- a/code/redalert/building.cpp +++ b/code/redalert/building.cpp @@ -4842,6 +4842,11 @@ void const * BuildingClass::Remap_Table(void) { assert(Buildings.ID(this) == ID); assert(IsActive); +// jmarshall + if(!Class->IsRemappable) { + return NULL; + } +// jmarshall end return(House->Remap_Table(IsBlushing, Class->Remap)); } diff --git a/code/redalert/conquer.cpp b/code/redalert/conquer.cpp index 6233136..078a2d0 100644 --- a/code/redalert/conquer.cpp +++ b/code/redalert/conquer.cpp @@ -3684,9 +3684,9 @@ void CC_Draw_Shape(void const * shapefile, int shapenum, int x, int y, WindowNum if ((flags & SHAPE_GHOST) && (!ghostdata)) { ghostdata = DisplayClass::SpecialGhost; } - if ((flags & SHAPE_FADING) && (!fadingdata)) { - fadingdata = DisplayClass::FadingShade; - } + //if ((flags & SHAPE_FADING) && (!fadingdata)) { + // fadingdata = DisplayClass::FadingShade; + //} static unsigned char * _xbuffer = 0; diff --git a/code/redalert/techno.cpp b/code/redalert/techno.cpp index 60bd504..4f31ce7 100644 --- a/code/redalert/techno.cpp +++ b/code/redalert/techno.cpp @@ -4683,7 +4683,7 @@ void const * TechnoClass::Remap_Table(void) const if (Techno_Type_Class()->IsRemappable) { return(House->Remap_Table(IsBlushing, Techno_Type_Class()->Remap)); } - return(ColorRemaps[PCOLOR_GOLD].RemapTable); + return NULL; }