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

Level editor and resource loader fixups and refactors

Browse Source
This commit is contained in:
elasota
2020-01-23 01:19:12 -05:00
parent 27a1f89c15
commit 5a3cedaa95
43 changed files with 310 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PortabilityLayer/PLCore.cpp
View File

@@ -87,7 +87,7 @@ Rect BERect::ToRect() const
CursHandle GetCursor(int cursorID)
{
return GetResource('CURS', cursorID).ReinterpretCast<Cursor>();
return PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('CURS', cursorID).ReinterpretCast<Cursor>();
}
void HideCursor()
@@ -119,17 +119,6 @@ short Alert(int dialogID, void *unknown)
return 0;
}
Handle GetResource(int32_t resType, int id)
{
return PortabilityLayer::ResourceManager::GetInstance()->GetResource(PortabilityLayer::ResTypeID(resType), id);
}
Handle GetResource(const char(&resTypeLiteral)[5], int id)
{
PL_NotYetImplemented();
return nullptr;
}
short FindWindow(Point point, WindowPtr *window)
{
short part = 0;
@@ -198,7 +187,7 @@ void GetWindowBounds(WindowPtr window, WindowRegionType windowRegion, Rect *rect
WindowPtr GetNewCWindow(int resID, void *storage, WindowPtr behind)
{
Handle windowResource = GetResource('WIND', resID);
Handle windowResource = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('WIND', resID);
if (!windowResource)
return nullptr;
@@ -361,7 +350,7 @@ void GetIndString(unsigned char *str, int stringsID, int fnameIndex)
if (fnameIndex < 1)
return;
THandle<uint8_t> istrRes = PortabilityLayer::ResourceManager::GetInstance()->GetResource('STR#', stringsID).StaticCast<uint8_t>();
THandle<uint8_t> istrRes = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('STR#', stringsID).StaticCast<uint8_t>();
if (istrRes && *istrRes)
{
const uint8_t *contentsBytes = *istrRes;
@@ -626,7 +615,7 @@ void *NewPtrClear(Size size)
void DisposePtr(void *ptr)
{
PL_NotYetImplemented();
PortabilityLayer::MemoryManager::GetInstance()->Release(ptr);
}
void BlockMove(const void *src, void *dest, Size size)