Cleanup, add scanline mask builder

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

View File

@@ -93,8 +93,6 @@ Boolean IsThisValid (short where, short who)
itsGood = true;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
switch ((*thisHouse)->rooms[where].objects[who].what)
{
case kObjectIsEmpty:
@@ -116,7 +114,6 @@ Boolean IsThisValid (short where, short who)
itsGood = (*thisHouse)->rooms[where].objects[who].data.c.state;
break;
}
HSetState((Handle)thisHouse, wasState);
return (itsGood);
}
@@ -261,8 +258,6 @@ void ListOneRoomsObjects (short where)
if (roomNum == kRoomIsEmpty)
return;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
for (n = 0; n < kMaxRoomObs; n++)
{
if (numMasterObjects < kMaxMasterObjects)
@@ -292,7 +287,6 @@ void ListOneRoomsObjects (short where)
numLocalMasterObjects++;
}
}
HSetState((Handle)thisHouse, wasState);
}
//-------------------------------------------------------------- ListAllLocalObjects
@@ -306,9 +300,6 @@ void ListAllLocalObjects (void)
numLocalMasterObjects = 0;
nHotSpots = 0;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
ListOneRoomsObjects(kCentralRoom);
if (numNeighbors > 1)
@@ -327,8 +318,6 @@ void ListAllLocalObjects (void)
ListOneRoomsObjects(kNorthWestRoom);
}
HSetState((Handle)thisHouse, wasState);
for (i = 0; i < numMasterObjects; i++) // correlate links with<74>
{ // index into this list
if ((masterObjects[i].roomLink != -1) && // if object has a link
@@ -368,8 +357,6 @@ Boolean SetObjectState (short room, short object, short action, short local)
char wasState;
Boolean changed;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
switch ((*thisHouse)->rooms[room].objects[object].what)
{
case kFloorVent:
@@ -693,7 +680,6 @@ Boolean SetObjectState (short room, short object, short action, short local)
break;
}
HSetState((Handle)thisHouse, wasState);
return (changed);
}
@@ -707,8 +693,6 @@ Boolean GetObjectState (short room, short object)
theState = true;
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse);
switch ((*thisHouse)->rooms[room].objects[object].what)
{
case kFloorVent:
@@ -864,8 +848,6 @@ Boolean GetObjectState (short room, short object)
case kChimes:
break;
}
HSetState((Handle)thisHouse, wasState);
return (theState);
}
@@ -909,8 +891,6 @@ void BringSendFrontBack (Boolean bringFront)
GenerateLinksList(); // Fill in links list with src/dest<73>
} // data on objects and room numbers.
wasState = HGetState((Handle)thisHouse);
HLock((Handle)thisHouse); // Lock down house.
thisHousePtr = *thisHouse; // Get a pointer to house structure.
for (i = 0; i < kMaxRoomObs; i++) // Set up an ordered array.
@@ -980,7 +960,6 @@ void BringSendFrontBack (Boolean bringFront)
}
}
HSetState((Handle)thisHouse, wasState);
if (linksList != nil)
DisposePtr((Ptr)linksList);