1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2025-09-07 16:50:15 +02:00

Score: inject 3DPB msg font into dat struct.

Fixed double free in sound.
This commit is contained in:
Muzychenko Andrey 2021-10-10 12:22:21 +03:00
parent 43593b168d
commit 69ecce88df
8 changed files with 117 additions and 141 deletions

View file

@ -75,7 +75,7 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
assertm(bmpHeader.Resolution <= 2, "partman: bitmap resolution out of bounds");
auto bmp = new gdrv_bitmap8(bmpHeader);
entryData->Buffer = reinterpret_cast<char*>(bmp);
entryData->Buffer = reinterpret_cast<char*>(bmp);
fread(bmp->IndexedBmpPtr, 1, bmpHeader.Size, fileHandle);
}
else if (entryType == FieldTypes::Bitmap16bit)
@ -120,13 +120,15 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
groupData->AddEntry(entryData);
}
groupData->FinalizeGroup();
datFile->Groups.push_back(groupData);
}
fclose(fileHandle);
if (datFile->Groups.size() == header.NumberOfGroups)
{
datFile->Finalize();
return datFile;
}
delete datFile;
return nullptr;
}