WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 12:09:36 +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

27
GpApp/RoomInfo.cpp
View File

@@ -59,7 +59,7 @@ Boolean originalLeftOpen, originalTopOpen, originalRightOpen, originalBottomOpe
Boolean originalFloor;
extern Cursor handCursor;
extern short houseResFork, lastBackground;
extern short lastBackground;
//============================================================== Functions
@@ -459,9 +459,9 @@ void DoRoomInfo (void)
}
if ((tempBack == 2002) || (tempBack == 2011) ||
(tempBack == 2016) || (tempBack == 2017))
LoadScaledGraphic(tileSrcMap, tempBack - 800, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack - 800, &tileSrcRect);
else
LoadScaledGraphic(tileSrcMap, tempBack, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack, &tileSrcRect);
for (i = 0; i < kNumTiles; i++)
tempTiles[i] = thisRoom->tiles[i];
@@ -547,7 +547,7 @@ void DoRoomInfo (void)
if ((tempBack != newBack) || (forceDraw))
{
tempBack = newBack;
LoadScaledGraphic(tileSrcMap, tempBack, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack, &tileSrcRect);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileSrc);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileDest);
}
@@ -573,9 +573,9 @@ void DoRoomInfo (void)
tempBack = newBack;
if ((tempBack == 2002) || (tempBack == 2011) ||
(tempBack == 2016) || (tempBack == 2017))
LoadScaledGraphic(tileSrcMap, tempBack - 800, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack - 800, &tileSrcRect);
else
LoadScaledGraphic(tileSrcMap, tempBack, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack, &tileSrcRect);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileSrc);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileDest);
}
@@ -586,7 +586,7 @@ void DoRoomInfo (void)
if (tempBack != newBack)
{
tempBack = newBack;
LoadScaledGraphic(tileSrcMap, tempBack, &tileSrcRect);
LoadScaledGraphicCustom(tileSrcMap, tempBack, &tileSrcRect);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileSrc);
InvalWindowRect(roomInfoDialog->GetWindow(), &tileDest);
}
@@ -857,7 +857,7 @@ short ChooseOriginalArt (short was)
Boolean PictIDExists (short theID)
{
THandle<BitmapImage> thePicture;
THandle<void> thePicture;
// Handle resHandle;
// Str255 resName;
// ResType resType;
@@ -867,10 +867,10 @@ Boolean PictIDExists (short theID)
foundIt = true;
thePicture = GetPicture(theID);
thePicture = LoadHouseResource('PICT', theID);
if (thePicture == nil)
{
thePicture = GetResource('Date', theID).StaticCast<BitmapImage>();
thePicture = LoadHouseResource('Date', theID);
if (thePicture == nil)
{
foundIt = false;
@@ -907,8 +907,11 @@ short GetFirstPICT (void)
{
Handle resHandle;
Str255 resName;
resHandle = Get1IndResource('PICT', 1);
PL_NotYetImplemented();
//resHandle = Get1IndResource('PICT', 1);
resHandle = Handle();
if (resHandle != nil)
{
const PortabilityLayer::ResourceArchiveRef *resRef = PortabilityLayer::ResourceManager::GetInstance()->ResourceForHandle(resHandle.MMBlock());