From e3fbcdc28aa1fd7d4bfddc93d800bea2bf523b13 Mon Sep 17 00:00:00 2001 From: Zero Fanker Date: Tue, 28 May 2024 21:18:31 -0400 Subject: [PATCH] fixed aircraft image management strategy . --- MissionEditor/IsoView.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/MissionEditor/IsoView.cpp b/MissionEditor/IsoView.cpp index 8ec55c0..ccb03ea 100644 --- a/MissionEditor/IsoView.cpp +++ b/MissionEditor/IsoView.cpp @@ -5622,20 +5622,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) { if (!missingimages[obj.type]) { SetError("Loading graphics"); theApp.m_loading->LoadUnitGraphic(obj.type); - p = pics[lpPicFile]; + lpPicFile = GetUnitPictureFilename(obj.type, facing); + if (!lpPicFile.IsEmpty()) { + p = pics[lpPicFile]; + } } if (p.pic == NULL) {