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

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/udata.cpp
+19 -4
View File
@@ -1015,7 +1015,12 @@ UnitType UnitTypeClass::From_Name(char const * name)
void UnitTypeClass::Display(int x, int y, WindowNumberType window, HousesType ) const
{
int shape = 0;
CC_DrawHD_Shape(Get_Cameo_Data(), shape, x, y, window, SHAPE_CENTER|SHAPE_WIN_REL);
void const * ptr = Get_Cameo_Data();
if (ptr == NULL) {
ptr = Get_Image_Data();
shape = Rotation/6;
}
CC_Draw_Shape(ptr, shape, x, y, window, SHAPE_CENTER|SHAPE_WIN_REL);
}
@@ -1079,7 +1084,17 @@ void UnitTypeClass::One_Time(void)
** Fetch the supporting data files for the unit.
*/
sprintf(buffer, "%sICON", uclass.Graphic_Name());
((Image_t*&)uclass.CameoData) = LoadCameoImage(buffer);
_makepath(fullname, NULL, NULL, buffer, ".SHP");
#ifndef NDEBUG
RawFileClass datafile(fullname);
if (datafile.Is_Available()) {
((void const *&)uclass.CameoData) = Load_Alloc_Data(datafile);
} else {
((void const *&)uclass.CameoData) = MFCD::Retrieve(fullname);
}
#else
((void const *&)uclass.CameoData) = MFCD::Retrieve(fullname);
#endif
// }
/*
@@ -1099,8 +1114,8 @@ void UnitTypeClass::One_Time(void)
((void const *&)uclass.ImageData) = ptr;
if (ptr != NULL) {
largest = max(largest, (int)Get_Build_Frame_Width(ptr, 0));
largest = max(largest, (int)Get_Build_Frame_Height(ptr, 0));
largest = max(largest, (int)Get_Build_Frame_Width(ptr));
largest = max(largest, (int)Get_Build_Frame_Height(ptr));
}
{
const char* imageFileName = Units_FindHDTexture(fullname, 0, 0);