tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-04-30 17:11:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some image loading logic error .

Browse source
This commit is contained in:
Zero Fanker 2024-05-27 23:05:42 -04:00
parent 7d9d27c3a3
commit eada71ea2a
2 changed files with 50 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
MissionEditor/IsoView.cpp
View file

@ -5438,18 +5438,35 @@ void CIsoView::DrawMap()
for (int upgrade = 0; upgrade < objp.upradecount; ++upgrade) {
const auto& upg = upgrade == 0 ? objp.upgrade1 : (upgrade == 1 ? objp.upgrade2 : objp.upgrade3);
if (upg.GetLength() == 0)
if (upg.GetLength() == 0) {
continue;
}
PICDATA pic;
int dir = (7 - objp.direction / 32) % 8;
pic = pics[GetUnitPictureFilename(upg, dir)];
if (!missingimages[upg] && pic.pic == NULL) {
int dir = 0;
if (rules.GetBool(upg, "Turret")) {
dir = (7 - objp.direction / 32) % 8;
}
auto const picName = GetUnitPictureFilename(upg, dir);
if (!picName.IsEmpty()) {
pic = pics[picName];
}
if (pic.pic == NULL && !missingimages[upg]) {
SetError("Loading graphics");
theApp.m_loading->LoadUnitGraphic(upg);
::Map->UpdateBuildingInfo(&upg);
pic = pics[GetUnitPictureFilename(upg, dir)];
if (pic.pic == NULL) missingimages[upg] = TRUE;
auto picNameAfterLoad = GetUnitPictureFilename(upg, dir);
if (picNameAfterLoad.IsEmpty()) {
picNameAfterLoad = GetUnitPictureFilename(upg, 0);
}
if (!picNameAfterLoad.IsEmpty()) {
pic = pics[picNameAfterLoad];
}
if (pic.pic == NULL) {
missingimages[upg] = TRUE;
}
}
if (pic.pic != NULL) {
@ -5549,21 +5566,25 @@ void CIsoView::DrawMap()
COLORREF c = GetColor(obj.house);
CString lpPicFile = GetUnitPictureFilename(obj.type, atoi(obj.direction) / 32);
auto const facing = atoi(obj.direction) / 32;
CString lpPicFile = GetUnitPictureFilename(obj.type, facing);
#ifndef NOSURFACES
DrawCell(drawCoords.x, drawCoords.y, 1, 1, c);
#endif
PICDATA p = pics[lpPicFile];
PICDATA p;
if (!lpPicFile.IsEmpty()) {
p = pics[lpPicFile];
}
if (p.pic == NULL || lpPicFile.GetLength() == 0) {
if (!missingimages[obj.type]) {
SetError("Loading graphics");
theApp.m_loading->LoadUnitGraphic(obj.type);
lpPicFile = GetUnitPictureFilename(obj.type, atoi(obj.direction) / 32);
p = pics[lpPicFile];
lpPicFile = GetUnitPictureFilename(obj.type, facing);
if (!lpPicFile.IsEmpty()) {
p = pics[lpPicFile];
}
}
if (p.pic == NULL) {
@ -5655,8 +5676,8 @@ void CIsoView::DrawMap()
int dir = (7 - atoi(obj.direction) / 32) % 8;
CString lpPicFile = GetUnitPictureFilename(obj.type, dir);
CString lpPicFile = GetUnitPictureFilename(obj.type, dir);
#ifndef NOSURFACES
DrawCell(drawCoords.x, drawCoords.y, 1, 1, c);
#endif
@ -5664,13 +5685,20 @@ void CIsoView::DrawMap()
static const ProjectedVec subPosLookup[5] = { ProjectedVec(0, -f_y / 4), ProjectedVec(f_x / 4 , 0), ProjectedVec(-f_x / 4, 0), ProjectedVec(0, f_y / 4), ProjectedVec() };
auto drawCoordsInf = drawCoords + subPosLookup[ic > 4 ? 4 : ic];
PICDATA p = pics[lpPicFile];
PICDATA p;
if (!lpPicFile.IsEmpty()) {
p = pics[lpPicFile];
}
if (p.pic == NULL) {
if (!missingimages[obj.type]) {
SetError("Loading graphics");
theApp.m_loading->LoadUnitGraphic(obj.type);
p = pics[lpPicFile];
lpPicFile = GetUnitPictureFilename(obj.type, dir);
if (!lpPicFile.IsEmpty()) {
p = pics[lpPicFile];
}
}
if (p.pic == NULL) {

12
MissionEditor/Loading.cpp
View file

@ -1509,12 +1509,13 @@ void CLoading::LoadBuilding(const CString& ID)
CString ImageID = GetBuildingFileID(ID);
auto const& rules = IniMegaFile::GetRules();
auto const& ppPowerUpBld = rules.GetString(ID, "PowersUpBuilding");
auto const& powerUpBldId = rules.GetString(ID, "PowersUpBuilding");
// Early load
if (!ppPowerUpBld.IsEmpty()) {
CString SrcBldName = GetBuildingFileID(*ppPowerUpBld) + "0";
if (!IsImageLoaded(SrcBldName))
LoadBuilding(*ppPowerUpBld);
if (!powerUpBldId.IsEmpty()) {
CString SrcBldName = GetBuildingFileID(powerUpBldId) + "0";
if (!IsImageLoaded(SrcBldName)) {
LoadBuilding(powerUpBldId);
}
}
auto loadAnimFrame = [this, &ArtID, &ID](const CString& key, const CString& controlKey) {
@ -1960,6 +1961,7 @@ void CLoading::LoadVehicleOrAircraft(const CString& ID)
void CLoading::SetImageData(unsigned char* pBuffer, const CString& NameInDict, int FullWidth, int FullHeight, Palette* pPal)
{
ASSERT(!NameInDict.IsEmpty());
auto& data = pics[NameInDict];
SetImageData(pBuffer, data, FullWidth, FullHeight, pPal);
}