From eada71ea2afbba15ddca281d70ae80ec2358d09c Mon Sep 17 00:00:00 2001
From: Zero Fanker <zcyfksn@vip.qq.com>
Date: Mon, 27 May 2024 23:05:42 -0400
Subject: [PATCH] fixed some image loading logic error .

---
 MissionEditor/IsoView.cpp | 58 +++++++++++++++++++++++++++++----------
 MissionEditor/Loading.cpp | 12 ++++----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/MissionEditor/IsoView.cpp b/MissionEditor/IsoView.cpp
index 9a08cd1..0fdda2c 100644
--- a/MissionEditor/IsoView.cpp
+++ b/MissionEditor/IsoView.cpp
@@ -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) {
diff --git a/MissionEditor/Loading.cpp b/MissionEditor/Loading.cpp
index ad95c86..7a85e25 100644
--- a/MissionEditor/Loading.cpp
+++ b/MissionEditor/Loading.cpp
@@ -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);
 }