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

Remaster Building Source filenames are now sourced from the XML file.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-21 10:54:00 -07:00
parent dac4c157cf
commit b19e278529
6 changed files with 111 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/BDATA.CPP
+6 -13
View File
@@ -3141,12 +3141,9 @@ void BuildingTypeClass::One_Time(void)
_makepath(fullname, NULL, NULL, building.Graphic_Name(), ".SHP");
((void const *&)building.ImageData) = MFCD::Retrieve(fullname);
{
char imageFileName[512];
sprintf(imageFileName, "DATA/ART/TEXTURES/SRGB/RED_ALERT/STRUCTURES/%s/%s-0000.TGA", building.Graphic_Name(), building.Graphic_Name());
((void const*&)building.HDImageData) = Image_LoadImage(imageFileName, true, true);
const char* imageFileName = Buildings_FindHDTexture(fullname, 0, 0);
if (!building.HDImageData) {
sprintf(imageFileName, "DATA/ART/TEXTURES/SRGB/RED_ALERT/STRUCTURES/%s/%s-0000-0000.TGA", building.Graphic_Name(), building.Graphic_Name());
if (imageFileName) {
((void const*&)building.HDImageData) = Image_LoadImage(imageFileName, true, true);
}
@@ -3393,15 +3390,11 @@ void BuildingTypeClass::Init(TheaterType theater)
((void const *&)classptr->ImageData) = MFCD::Retrieve(fullname);
// jmarshall
{
char imageFileName[512];
const char* imageFileName = Buildings_FindHDTexture(fullname, 0, 0);
// Try load the theatre specific asset first
sprintf(imageFileName, "DATA/ART/TEXTURES/SRGB/RED_ALERT/TERRAIN/%s/%s.%s/%s.%s-0000.DDS", Theaters[theater].Name, classptr->Graphic_Name(), Theaters[theater].Suffix, classptr->Graphic_Name(), Theaters[theater].Suffix);
((BuildingTypeClass*)classptr)->HDImageData = Image_LoadImage(imageFileName);
if (!((BuildingTypeClass*)classptr)->HDImageData) {
sprintf(imageFileName, "DATA/ART/TEXTURES/SRGB/RED_ALERT/STRUCTURES/%s/%s-0000.TGA", classptr->Graphic_Name(), classptr->Graphic_Name());
((BuildingTypeClass*)classptr)->HDImageData = Image_LoadImage(imageFileName);
// Try load the theatre specific asset first
if (imageFileName) {
((BuildingTypeClass*)classptr)->HDImageData = Image_LoadImage(imageFileName, true, true);
}
if (classptr->ImageData != NULL && classptr->HDImageData != NULL) {