hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the lepton size being incorrect.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-01 19:17:09 -07:00
parent 681ab2fa9c
commit d141e5ee53
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/cdata.cpp
-1
View File
@@ -2367,7 +2367,6 @@ TemplateType TemplateTypeClass::From_Name(char const * name)
return(TEMPLATE_NONE);
}
/***********************************************************************************************
* TemplateTypeClass::Occupy_List -- Determines occupation list. *
* *
code/redalert/cell.cpp
-1
View File
@@ -999,7 +999,6 @@ bool CellClass::Get_Template_Info(char *template_name, int &icon, void *&image_d
}
void CellClass::ConvertCoordsToIsometric(int& x, int& y) {
y = y * 2;
int tileWidth = CELL_PIXEL_W;
int tileHeight = CELL_PIXEL_H;
int sx = (x / CELL_PIXEL_W) * (tileWidth / 2) - (y / CELL_PIXEL_W) * (tileWidth / 2);
code/redalert/display.h
+2 -2
View File
@@ -44,8 +44,8 @@ struct Image_t;
#define ICON_PIXEL_W 48
#define ICON_PIXEL_H 24
// jmarshall end
#define ICON_LEPTON_W 512
#define ICON_LEPTON_H 256
#define ICON_LEPTON_W 256
#define ICON_LEPTON_H 128
#define CELL_PIXEL_W ICON_PIXEL_W
#define CELL_PIXEL_H ICON_PIXEL_H
#define CELL_LEPTON_W ICON_LEPTON_W
code/redalert/image.h
+4 -2
View File
@@ -64,11 +64,13 @@ struct IsoTileHeader_t {
int TileImageHeight;
};
#define WESTWOOD_ISO_NOTSET_FLAG -842150451 // Westwood didn't zero everything out in there tile exporter, so this is required.
struct IsoTileImageHeader
{
uint8_t* GetExtraData(void)
{
if(ExtraOffset == 0) {
{
if(ExtraOffset == 0 || ExtraOffset == WESTWOOD_ISO_NOTSET_FLAG) {
return NULL;
}
return reinterpret_cast<uint8_t*>(this) + ExtraOffset + sizeof(IsoTileImageHeader);