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

revert changes to have a new cleaner PR after review/cherry picks

This commit is contained in:
toxie 2021-10-18 09:12:53 +02:00
parent efd4dc1d9e
commit d106f0f771
31 changed files with 101 additions and 245 deletions

View file

@ -27,12 +27,8 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
return nullptr;
}
DatFile* datFile;
try
{
datFile = new DatFile();
}
catch (...)
auto datFile = new DatFile();
if (!datFile)
{
fclose(fileHandle);
return nullptr;
@ -43,12 +39,8 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
if (header.Unknown)
{
char* unknownBuf;
try
{
unknownBuf = new char[header.Unknown];
}
catch (...)
auto unknownBuf = new char[header.Unknown];
if (!unknownBuf)
{
fclose(fileHandle);
delete datFile;
@ -115,18 +107,13 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
}
else
{
char* entryBuffer;
try
auto entryBuffer = new char[fieldSize];
entryData->Buffer = entryBuffer;
if (!entryBuffer)
{
entryBuffer = new char[fieldSize];
}
catch (...)
{
entryData->Buffer = nullptr;
abort = true;
break;
}
entryData->Buffer = entryBuffer;
fread(entryBuffer, 1, fieldSize, fileHandle);
}