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

Revert "Merge branch 'Isometric-Dev' into master"

Browse Source 
This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/object.cpp
+2 -34
View File
@@ -98,7 +98,6 @@
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#include "function.h"
#include "image.h"
/*
** Selected objects have a special marking box around them. This is the shapes that are
@@ -142,8 +141,6 @@ ObjectClass::ObjectClass(RTTIType rtti, int id) :
Strength(255),
IsSelectedMask(0) // Mask showing who has selected this object
{
renderX = -1;
renderY = -1;
}
@@ -1298,13 +1295,6 @@ bool ObjectClass::Select(bool allow_mixed)
return(true);
}
//
// ObjectClass::SetRenderXY
//
void ObjectClass::SetRenderXY(int x, int y) {
renderX = x;
renderY = y;
}
/***********************************************************************************************
* ObjectClass::Render -- Displays the object onto the map. *
@@ -1336,7 +1326,7 @@ bool ObjectClass::Render(bool forced) const
const_cast<ObjectClass*>(this)->IsToDisplay = false; // added const_cast ST - 5/9/2019
if (Map.Coord_To_Pixel(coord, x, y)) {
CellClass::ConvertCoordsToIsometric(x, y);
/*
** Draw the object itself
*/
@@ -2210,28 +2200,6 @@ ObjectTypeClass::ObjectTypeClass(
DimensionData = NULL;
}
Image_t* ObjectTypeClass::LoadCameoImage(const char* fileName) {
char fullnamehd[2048];
// Try and load a HD cameo image.
sprintf(fullnamehd, "ui/sidebar/icons/%s.png", fileName);
Image_t* hdImage = Image_LoadImage(fullnamehd);
if (hdImage) {
return hdImage;
}
// If there is no HD image, then load the old 8bit image.
char fullname[_MAX_FNAME + _MAX_EXT];
_makepath(fullname, NULL, NULL, fileName, ".SHP");
const void* shapefile = MFCD::Retrieve(fullname);
int width = Get_Build_Frame_Width(shapefile, -1);
int height = Get_Build_Frame_Height(shapefile, -1);
const char* buffer = (const char* )Build_Frame(shapefile, 0, _ShapeBuffer);
Image_t* image = Image_CreateImageFrom8Bit(fullname, width, height, (unsigned char *)buffer);
return image;
}
/***********************************************************************************************
* ObjectTypeClass::Max_Pips -- Fetches the maximum pips allowed for this object. *
@@ -2338,7 +2306,7 @@ int ObjectTypeClass::Time_To_Build(HousesType ) const
* HISTORY: *
* 07/19/1995 JLB : Created. *
*=============================================================================================*/
struct Image_t* ObjectTypeClass::Get_Cameo_Data(void) const
void const * ObjectTypeClass::Get_Cameo_Data(void) const
{
return(NULL);
}