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/idata.cpp
+19 -3
View File
@@ -1317,8 +1317,13 @@ void InfantryTypeClass::Display(int x, int y, WindowNumberType window, HousesTyp
if (house != HOUSE_NONE) {
int shape = 0;
struct Image_t *ptr = Get_Cameo_Data();
CC_DrawHD_Shape(ptr, shape, x, y, window, SHAPE_NORMAL|SHAPE_CENTER|SHAPE_WIN_REL);
void const * ptr = Get_Cameo_Data();
if (ptr == NULL) {
ptr = Get_Image_Data();
shape = 2;
}
CC_Draw_Shape(ptr, shape, x, y, window, SHAPE_NORMAL|SHAPE_CENTER|SHAPE_WIN_REL);
}
}
@@ -1463,7 +1468,18 @@ void InfantryTypeClass::One_Time(void)
*/
char buffer[_MAX_FNAME];
sprintf(buffer, "%.4sICON", uclass->Graphic_Name());
((Image_t*&)uclass->CameoData) = LoadCameoImage(buffer);
_makepath(fullname, NULL, NULL, buffer, ".SHP");
#ifndef NDEBUG
RawFileClass ifile(fullname);
if (ifile.Is_Available()) {
((void const *&)uclass->CameoData) = Load_Alloc_Data(ifile);
} else {
((void const *&)uclass->CameoData) = MFCD::Retrieve(fullname);
}
#else
((void const *&)uclass->CameoData) = MFCD::Retrieve(fullname);
#endif
}
}