WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 23:00:42 +00:00
Code Issues Projects Releases Wiki Activity

File system refactor, bug fixes

Browse Source
This commit is contained in:
elasota
2021-03-07 04:24:13 -05:00
parent 6715bcb030
commit 3917e1a370
70 changed files with 2417 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
GpApp/SelectHouse.cpp
View File

@@ -101,18 +101,26 @@ void UpdateLoadDialog (Dialog *theDialog)
if (SectRect(&dialogRect, &tempRect, &dummyRect))
{
PortabilityLayer::IResourceArchive *resFile = PortabilityLayer::ResourceManager::GetInstance()->LoadResFile(theHousesSpecs[i].m_dir, theHousesSpecs[i].m_name);
if (resFile != nullptr)
PortabilityLayer::CompositeFile *cfile = PortabilityLayer::FileManager::GetInstance()->OpenCompositeFile(theHousesSpecs[i].m_dir, theHousesSpecs[i].m_name);
bool haveHouseIcon = false;
GpIOStream *resStream = nil;
if (cfile)
{
if (!LargeIconPlot(surface, resFile, -16455, tempRect))
PortabilityLayer::IResourceArchive *resFile = PortabilityLayer::ResourceManager::GetInstance()->LoadResFile(cfile);
if (resFile != nullptr)
{
LoadDialogPICT(theDialog, kLoadIconFirstItem + i - housePage,
kDefaultHousePict8);
if (LargeIconPlot(surface, resFile, -16455, tempRect))
haveHouseIcon = true;
resFile->Destroy();
}
resFile->Destroy();
cfile->Close();
}
else
if (!haveHouseIcon)
LoadDialogPICT(theDialog, kLoadIconFirstItem + i - housePage,
kDefaultHousePict8);
}
@@ -411,11 +419,8 @@ void DoLoadHouse (void)
whoCares = CloseHouse();
PasStringCopy(theHousesSpecs[thisHouseIndex].m_name,
thisHouseName);
if (OpenHouse())
{
whoCares = ReadHouse();
if (OpenHouse(true))
houseNameDirty = true;
}
}
leaving = true;
}
@@ -452,11 +457,8 @@ void DoLoadHouse (void)
whoCares = CloseHouse();
PasStringCopy(theHousesSpecs[thisHouseIndex].m_name,
thisHouseName);
if (OpenHouse())
{
whoCares = ReadHouse();
if (OpenHouse(true))
houseNameDirty = true;
}
}
leaving = true;
}
@@ -489,11 +491,8 @@ void DoLoadHouse (void)
whoCares = CloseHouse();
PasStringCopy(theHousesSpecs[thisHouseIndex].m_name,
thisHouseName);
if (OpenHouse())
{
whoCares = ReadHouse();
if (OpenHouse(true))
houseNameDirty = true;
}
}
leaving = true;
}