mirror of
https://github.com/jmarshall23/CnC_Remastered_Collection.git
synced 2026-08-12 08:00:55 +02:00
Moved trans hash mark icons to PNG's and now render properly.
This commit is contained in:
@@ -1262,10 +1262,12 @@ void CellClass::Draw_It(int x, int y, bool objects)
|
|||||||
lastRenderY = yy;
|
lastRenderY = yy;
|
||||||
|
|
||||||
if (Map.ProximityCheck && Is_Clear_To_Build(loco)) {
|
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 {
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -87,6 +87,7 @@
|
|||||||
|
|
||||||
#include "function.h"
|
#include "function.h"
|
||||||
#include "vortex.h"
|
#include "vortex.h"
|
||||||
|
#include "image.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** These layer control elements are used to group the displayable objects
|
** 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];
|
unsigned char DisplayClass::MouseTranslucentTable[(4+1)*256];
|
||||||
void const * DisplayClass::TransIconset;
|
void const * DisplayClass::TransIconset;
|
||||||
// jmarshall
|
// jmarshall
|
||||||
Image_t* DisplayClass::TransIconsetHD;
|
Image_t* DisplayClass::TransIconsetHD[3] = { 0 };
|
||||||
// jmarshall end
|
// jmarshall end
|
||||||
unsigned char DisplayClass::UnitShadow[(USHADOW_COL_COUNT+1)*256];
|
unsigned char DisplayClass::UnitShadow[(USHADOW_COL_COUNT+1)*256];
|
||||||
unsigned char DisplayClass::UnitShadowAir[(USHADOW_COL_COUNT+1)*256];
|
unsigned char DisplayClass::UnitShadowAir[(USHADOW_COL_COUNT+1)*256];
|
||||||
@@ -190,7 +191,6 @@ DisplayClass::DisplayClass(void) :
|
|||||||
{
|
{
|
||||||
ShadowShapes = 0;
|
ShadowShapes = 0;
|
||||||
TransIconset = 0;
|
TransIconset = 0;
|
||||||
TransIconsetHD = 0;
|
|
||||||
|
|
||||||
Set_View_Dimensions(0, 8 * RESFACTOR, ScreenWidth, ScreenHeight);
|
Set_View_Dimensions(0, 8 * RESFACTOR, ScreenWidth, ScreenHeight);
|
||||||
}
|
}
|
||||||
@@ -232,10 +232,10 @@ void DisplayClass::One_Time(void)
|
|||||||
** Load the generic transparent icon set.
|
** Load the generic transparent icon set.
|
||||||
*/
|
*/
|
||||||
// jmarshall
|
// jmarshall
|
||||||
// TransIconset = MFCD::Retrieve("TRANS.ICN");
|
TransIconset = MFCD::Retrieve("TRANS.ICN");
|
||||||
//// jmarshall
|
TransIconsetHD[0] = Image_LoadImage("ui/trans/trans0.png");
|
||||||
// TransIconsetHD = Load_Stamp("TRANS_ICON", TransIconset);
|
TransIconsetHD[1] = Image_LoadImage("ui/trans/trans1.png");
|
||||||
//// jmarshall end
|
TransIconsetHD[2] = Image_LoadImage("ui/trans/trans2.png");
|
||||||
// jmarshall end
|
// jmarshall end
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ class DisplayClass: public MapClass
|
|||||||
static unsigned char MouseTranslucentTable[(4+1)*256];
|
static unsigned char MouseTranslucentTable[(4+1)*256];
|
||||||
static void const *TransIconset;
|
static void const *TransIconset;
|
||||||
// jmarshall
|
// jmarshall
|
||||||
static Image_t* TransIconsetHD;
|
static Image_t* TransIconsetHD[3];
|
||||||
// jmarshall end
|
// jmarshall end
|
||||||
static unsigned char UnitShadow[(USHADOW_COL_COUNT+1)*256];
|
static unsigned char UnitShadow[(USHADOW_COL_COUNT+1)*256];
|
||||||
static unsigned char UnitShadowAir[(USHADOW_COL_COUNT+1)*256];
|
static unsigned char UnitShadowAir[(USHADOW_COL_COUNT+1)*256];
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Reference in New Issue
Block a user