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

Cleanup, add scanline mask builder

Browse Source
This commit is contained in:
elasota
2019-12-26 12:58:58 -05:00
parent b10dda4a54
commit c4e93b0ccf
61 changed files with 823 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
GpApp/ObjectEdit.cpp
View File

@@ -529,11 +529,8 @@ void DragObject (Point where)
if (objActive == kInitialGliderSelected)
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
(*thisHouse)->initial.h += deltaH;
(*thisHouse)->initial.v += deltaV;
HSetState((Handle)thisHouse, wasState);
}
else if (objActive == kLeftGliderSelected)
{
@@ -805,8 +802,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kDoorExLf)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kDoorExLf;
@@ -818,7 +813,6 @@ void AddObjectPairing (void)
testRoomPtr->objects[emptySlot].data.d.wide = 0;
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
@@ -839,8 +833,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kDoorExRt)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kDoorExRt;
@@ -853,8 +845,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -874,8 +864,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kDoorInLfLeft)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kDoorInLf;
@@ -888,8 +876,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -909,8 +895,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kDoorInRtLeft)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kDoorInRt;
@@ -923,8 +907,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -944,8 +926,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kWindowExRt)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kWindowExRt;
@@ -958,8 +938,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -979,8 +957,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kWindowExLf)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kWindowExLf;
@@ -993,8 +969,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -1014,8 +988,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kWindowInLf)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kWindowInLf;
@@ -1028,8 +1000,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -1049,8 +1019,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kWindowInRt)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kWindowInRt;
@@ -1063,8 +1031,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -1084,8 +1050,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kDownStairs)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kDownStairs;
@@ -1099,8 +1063,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -1120,8 +1082,6 @@ void AddObjectPairing (void)
emptySlot = FindObjectSlotInRoom(roomNum);
if ((emptySlot != -1) && (!DoesRoomNumHaveObject(roomNum, kUpStairs)))
{
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
testRoomPtr = &((*thisHouse)->rooms[roomNum]);
testRoomPtr->objects[emptySlot].what = kUpStairs;
@@ -1135,8 +1095,6 @@ void AddObjectPairing (void)
testRoomPtr->numObjects++;
HSetState((Handle)thisHouse, wasState);
GetLocalizedString(45, message);
OpenMessageWindow(message);
ForeColor(blueColor);
@@ -1486,11 +1444,8 @@ void MoveObject (short whichWay, Boolean shiftDown)
if (objActive == kInitialGliderSelected)
{
wasRect = initialGliderRect;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
(*thisHouse)->initial.h += deltaH;
(*thisHouse)->initial.v += deltaV;
HSetState((Handle)thisHouse, wasState);
}
else if (objActive == kLeftGliderSelected)
{
@@ -2288,9 +2243,7 @@ void GetThisRoomsObjRects (void)
}
else
{
HLock((Handle)thePict);
roomObjectRects[i] = (*thePict)->picFrame.ToRect();
HUnlock((Handle)thePict);
}
ZeroRectCorner(&roomObjectRects[i]);
QOffsetRect(&roomObjectRects[i],