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 09:01:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix: program crashes if SHP unit don't have enough frame for turret drawing. Now turret frame will be skipped in such case.

Browse source
This commit is contained in:
Zero Fanker 2025-03-12 19:29:35 -04:00
parent 1cc8dd9e81
commit dae7796e0b
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
MissionEditor/Loading.cpp
View file

@ -1762,30 +1762,43 @@ void CLoading::LoadVehicleOrAircraft(const CString& ID)
unsigned char* FramesBuffers[2];
FSunPackLib::SetCurrentSHP(FileName, nMix);
FSunPackLib::XCC_GetSHPHeader(&header);
const int nStartWalkFrame = art.GetInteger(ArtID, "StartWalkFrame", 0);
const int nWalkFrames = art.GetInteger(ArtID, "WalkFrames", 1);
for (int i = 0; i < 8; ++i) {
FSunPackLib::LoadSHPImage(framesToRead[i], 1, &FramesBuffers[0]);
if (!FSunPackLib::LoadSHPImage(framesToRead[i], 1, &FramesBuffers[0])) {
break;
}
CString DictName;
DictName.Format("%s%d", ImageID, i);
CString PaletteName = art.GetStringOr(ArtID, "Palette", "unit");
GetFullPaletteName(PaletteName, cur_theat);
if (bHasTurret) {
int nStartWalkFrame = art.GetInteger(ArtID, "StartWalkFrame", 0);
int nWalkFrames = art.GetInteger(ArtID, "WalkFrames", 1);
int turretFramesToRead[8];
do {
auto const turretFrameIndex = nStartWalkFrame + 8 * nWalkFrames + 4 * ((i + 1) % 8);
// illegal frame
if (turretFrameIndex >= header.c_images / 2) {
bHasTurret = false;
break;
}
// fix from cmcc
turretFramesToRead[i] = nStartWalkFrame + 8 * nWalkFrames + 4 * ((i + 1) % 8);
if (!FSunPackLib::LoadSHPImage(turretFrameIndex, 1, &FramesBuffers[1])) {
bHasTurret = false;
break;
}
UnionSHP_Add(FramesBuffers[0], header.cx, header.cy);
UnionSHP_Add(FramesBuffers[1], header.cx, header.cy);
unsigned char* outBuffer;
int outW, outH;
UnionSHP_GetAndClear(outBuffer, &outW, &outH);
FSunPackLib::LoadSHPImage(turretFramesToRead[i], 1, &FramesBuffers[1]);
UnionSHP_Add(FramesBuffers[0], header.cx, header.cy);
UnionSHP_Add(FramesBuffers[1], header.cx, header.cy);
unsigned char* outBuffer;
int outW, outH;
UnionSHP_GetAndClear(outBuffer, &outW, &outH);
SetImageData(outBuffer, DictName, outW, outH, m_palettes.LoadPalette(PaletteName));
} else {
SetImageData(outBuffer, DictName, outW, outH, m_palettes.LoadPalette(PaletteName));
} while (0);
}
if (!bHasTurret) {
SetImageData(FramesBuffers[0], DictName, header.cx, header.cy, m_palettes.LoadPalette(PaletteName));
}
}