diff --git a/code/redalert/cell.cpp b/code/redalert/cell.cpp index d8650f6..786ea96 100644 --- a/code/redalert/cell.cpp +++ b/code/redalert/cell.cpp @@ -1262,10 +1262,12 @@ void CellClass::Draw_It(int x, int y, bool objects) lastRenderY = yy; if (Map.ProximityCheck && Is_Clear_To_Build(loco)) { - LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 0, xx, yy, NULL, WINDOW_TACTICAL); + //LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 0, xx, yy, NULL, WINDOW_TACTICAL); + CC_DrawHD_Shape(DisplayClass::TransIconsetHD[0], 0, xx, yy, WINDOW_TACTICAL, SHAPE_NORMAL); } else { - LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 2, xx, yy, NULL, WINDOW_TACTICAL); + //LogicPage->Draw_Stamp(DisplayClass::TransIconsetHD, 2, xx, yy, NULL, WINDOW_TACTICAL); + CC_DrawHD_Shape(DisplayClass::TransIconsetHD[2], 0, xx, yy, WINDOW_TACTICAL, SHAPE_NORMAL); } } diff --git a/code/redalert/display.cpp b/code/redalert/display.cpp index d7ee626..4cc5dcf 100644 --- a/code/redalert/display.cpp +++ b/code/redalert/display.cpp @@ -87,6 +87,7 @@ #include "function.h" #include "vortex.h" +#include "image.h" /* ** These layer control elements are used to group the displayable objects @@ -109,7 +110,7 @@ unsigned char DisplayClass::WhiteTranslucentTable[(1+1)*256]; unsigned char DisplayClass::MouseTranslucentTable[(4+1)*256]; void const * DisplayClass::TransIconset; // jmarshall -Image_t* DisplayClass::TransIconsetHD; +Image_t* DisplayClass::TransIconsetHD[3] = { 0 }; // jmarshall end unsigned char DisplayClass::UnitShadow[(USHADOW_COL_COUNT+1)*256]; unsigned char DisplayClass::UnitShadowAir[(USHADOW_COL_COUNT+1)*256]; @@ -190,7 +191,6 @@ DisplayClass::DisplayClass(void) : { ShadowShapes = 0; TransIconset = 0; - TransIconsetHD = 0; Set_View_Dimensions(0, 8 * RESFACTOR, ScreenWidth, ScreenHeight); } @@ -232,10 +232,10 @@ void DisplayClass::One_Time(void) ** Load the generic transparent icon set. */ // jmarshall -// TransIconset = MFCD::Retrieve("TRANS.ICN"); -//// jmarshall -// TransIconsetHD = Load_Stamp("TRANS_ICON", TransIconset); -//// jmarshall end + TransIconset = MFCD::Retrieve("TRANS.ICN"); + TransIconsetHD[0] = Image_LoadImage("ui/trans/trans0.png"); + TransIconsetHD[1] = Image_LoadImage("ui/trans/trans1.png"); + TransIconsetHD[2] = Image_LoadImage("ui/trans/trans2.png"); // jmarshall end #ifndef NDEBUG diff --git a/code/redalert/display.h b/code/redalert/display.h index 524cc27..2217eb6 100644 --- a/code/redalert/display.h +++ b/code/redalert/display.h @@ -118,7 +118,7 @@ class DisplayClass: public MapClass static unsigned char MouseTranslucentTable[(4+1)*256]; static void const *TransIconset; // jmarshall - static Image_t* TransIconsetHD; + static Image_t* TransIconsetHD[3]; // jmarshall end static unsigned char UnitShadow[(USHADOW_COL_COUNT+1)*256]; static unsigned char UnitShadowAir[(USHADOW_COL_COUNT+1)*256]; diff --git a/ui/trans/trans0.png b/ui/trans/trans0.png new file mode 100644 index 0000000..de36efb Binary files /dev/null and b/ui/trans/trans0.png differ diff --git a/ui/trans/trans1.png b/ui/trans/trans1.png new file mode 100644 index 0000000..4d8ee62 Binary files /dev/null and b/ui/trans/trans1.png differ diff --git a/ui/trans/trans2.png b/ui/trans/trans2.png new file mode 100644 index 0000000..bd4d28f Binary files /dev/null and b/ui/trans/trans2.png differ