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

Refactoring, dialog work

Browse Source
This commit is contained in:
elasota
2019-12-31 02:42:20 -05:00
parent 04a955213c
commit 84e4f9fb0b
26 changed files with 817 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GpApp/About.cpp
View File

@@ -21,8 +21,8 @@
static void HiLiteOkayButton (DrawSurface *surface);
static void UnHiLiteOkayButton (DrawSurface *surface);
static void UpdateMainPict (DialogPtr);
static Boolean AboutFilter (DialogPtr, EventRecord *theEvent, short *hit);
static void UpdateMainPict (Dialog *);
static Boolean AboutFilter (Dialog *, EventRecord *theEvent, short *hit);
static PortabilityLayer::ScanlineMask *okayButtScanlineMask;
@@ -40,7 +40,7 @@ void DoAbout (void)
#define kTextItemVers 2 // item number of version text
#define kPictItemMain 4 // item number of main PICT
DialogPtr aboutDialog;
Dialog *aboutDialog;
Str255 longVersion;
StringPtr messagePtr;
VersRecHndl version;
@@ -143,7 +143,7 @@ static void UnHiLiteOkayButton (DrawSurface *surface)
//-------------------------------------------------------------- UpdateMainPict
// Redraws the main graphic in the dialog (in response to an update event).
static void UpdateMainPict (DialogPtr theDial)
static void UpdateMainPict (Dialog *theDial)
{
Str255 theStr, theStr2;
uint64_t freeMemory;
@@ -175,7 +175,7 @@ static void UpdateMainPict (DialogPtr theDial)
//-------------------------------------------------------------- AboutFilter
// Dialog filter for the About dialog.
static Boolean AboutFilter (DialogPtr theDial, EventRecord *theEvent, short *hit)
static Boolean AboutFilter (Dialog *theDial, EventRecord *theEvent, short *hit)
{
Point mousePt;
UInt32 dummyLong;

96
GpApp/DialogUtils.cpp
View File

@@ -5,6 +5,7 @@
//============================================================================
#include "DialogManager.h"
#include "PLArrayView.h"
#include "PLControlDefinitions.h"
#include "PLLowMem.h"
#include "PLNumberFormatting.h"
@@ -25,7 +26,7 @@
// Given a dialog pointer and a resource ID, this function brings it up<75>
// centered, visible, and with the default button outlined.
void BringUpDialog (DialogPtr *theDialog, short dialogID)
void BringUpDialog (Dialog **theDialog, short dialogID)
{
*theDialog = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(dialogID, kPutInFront);
@@ -141,13 +142,15 @@ void CenterDialog (SInt16 dialogID)
void GetDialogRect (Rect *bounds, short dialogID)
{
DialogTHndl dlogHandle;
Byte wasState;
dlogHandle = GetResource('DLOG', dialogID).StaticCast<DialogTemplate>();
Handle dlogHandle = GetResource('DLOG', dialogID).StaticCast<void>();
if (dlogHandle != nil)
{
*bounds = (**dlogHandle).boundsRect;
BERect dataRect = **dlogHandle.StaticCast<BERect>();
*bounds = dataRect.ToRect();
dlogHandle.Dispose();
}
}
@@ -333,7 +336,7 @@ void ZoomOutAlertRect (short alertID)
// Flashes the default dialog button (item = 1) so as to make it appear<61>
// as though the user clicked on it.
void FlashDialogButton (DialogPtr theDialog, short itemNumber)
void FlashDialogButton (Dialog *theDialog, short itemNumber)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -350,23 +353,33 @@ void FlashDialogButton (DialogPtr theDialog, short itemNumber)
// Draws a fat outline around the default item (item = 1). This is the<68>
// item that is selected if the user hits the Return key.
void DrawDefaultButton (DialogPtr theDialog)
void DrawDefaultButton (Dialog *theDialog)
{
Rect itemRect;
ControlHandle itemHandle;
short itemType;
GetDialogItem(theDialog, 1, &itemType, &itemHandle, &itemRect);
DialogItem *firstItem = *theDialog->GetItems().begin();
Rect itemRect = firstItem->GetRect();
DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
InsetRect(&itemRect, -4, -4);
PenSize(3, 3);
FrameRoundRect(&itemRect, 16, 16);
surface->SetForeColor(StdColors::Black());
for (int xOffset = 0; xOffset < 3; xOffset++)
{
for (int yOffset = 0; yOffset < 3; yOffset++)
{
const Rect offsetRect = itemRect + Point::Create(xOffset, yOffset);
surface->FrameRoundRect(itemRect, 8, 8);
}
}
PenNormal();
}
//-------------------------------------------------------------- GetDialogString
// Returns a string from a specific dialog item.
void GetDialogString (DialogPtr theDialog, short item, StringPtr theString)
void GetDialogString (Dialog *theDialog, short item, StringPtr theString)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -379,7 +392,7 @@ void GetDialogString (DialogPtr theDialog, short item, StringPtr theString)
//-------------------------------------------------------------- SetDialogString
// Sets a specific string to a specific dialog item.
void SetDialogString (DialogPtr theDialog, short item, const PLPasStr &theString)
void SetDialogString (Dialog *theDialog, short item, const PLPasStr &theString)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -392,7 +405,7 @@ void SetDialogString (DialogPtr theDialog, short item, const PLPasStr &theString
//-------------------------------------------------------------- GetDialogStringLen
// Returns the length of a dialog item string (text).
short GetDialogStringLen (DialogPtr theDialog, short item)
short GetDialogStringLen (Dialog *theDialog, short item)
{
Rect itemRect;
Str255 theString;
@@ -408,7 +421,7 @@ short GetDialogStringLen (DialogPtr theDialog, short item)
// Returns the value or "state" of a dialog item. For checkboxes and<6E>
// radio buttons, this may be a 1 or 0.
void GetDialogItemValue (DialogPtr theDialog, short item, short *theState)
void GetDialogItemValue (Dialog *theDialog, short item, short *theState)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -422,7 +435,7 @@ void GetDialogItemValue (DialogPtr theDialog, short item, short *theState)
// Sets a specific dialogf items value or state (can set or clear<61>
// checkboxes, radio buttons, etc.).
void SetDialogItemValue (DialogPtr theDialog, short item, short theState)
void SetDialogItemValue (Dialog *theDialog, short item, short theState)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -435,7 +448,7 @@ void SetDialogItemValue (DialogPtr theDialog, short item, short theState)
//-------------------------------------------------------------- ToggleDialogItemValue
// If item is a checkbox or radio button, its state is toggled.
void ToggleDialogItemValue (DialogPtr theDialog, short item)
void ToggleDialogItemValue (Dialog *theDialog, short item)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -454,7 +467,7 @@ void ToggleDialogItemValue (DialogPtr theDialog, short item)
// Function accepts an integer, converts it to a string and sets a<>
// dialog items text to this string.
void SetDialogNumToStr (DialogPtr theDialog, short item, long theNumber)
void SetDialogNumToStr (Dialog *theDialog, short item, long theNumber)
{
Str255 theString;
Rect itemRect;
@@ -470,7 +483,7 @@ void SetDialogNumToStr (DialogPtr theDialog, short item, long theNumber)
// Function extracts the text from a dialog item and converts it to an<61>
// integer for returning.
void GetDialogNumFromStr (DialogPtr theDialog, short item, long *theNumber)
void GetDialogNumFromStr (Dialog *theDialog, short item, long *theNumber)
{
Str255 theString;
Rect itemRect;
@@ -485,19 +498,16 @@ void GetDialogNumFromStr (DialogPtr theDialog, short item, long *theNumber)
//-------------------------------------------------------------- GetDialogItemRect
// Returns the bounding rectangle of the specified dialog item.
void GetDialogItemRect (DialogPtr theDialog, short item, Rect *theRect)
void GetDialogItemRect (Dialog *theDialog, short item, Rect *theRect)
{
ControlHandle itemHandle;
short itemType;
GetDialogItem(theDialog, item, &itemType, &itemHandle, theRect);
*theRect = theDialog->GetItems()[item - 1]->GetRect();
}
//-------------------------------------------------------------- SetDialogItemRect
// Sets the bounding rectangle of the specified dialog item. Used to<74>
// resize or move a control.
void SetDialogItemRect (DialogPtr theDialog, short item, Rect *theRect)
void SetDialogItemRect (Dialog *theDialog, short item, Rect *theRect)
{
Rect oldRect;
ControlHandle itemHandle;
@@ -511,7 +521,7 @@ void SetDialogItemRect (DialogPtr theDialog, short item, Rect *theRect)
//-------------------------------------------------------------- OffsetDialogItemRect
// Moves a dialog item by h and v.
void OffsetDialogItemRect (DialogPtr theDialog, short item, short h, short v)
void OffsetDialogItemRect (Dialog *theDialog, short item, short h, short v)
{
Rect oldRect;
ControlHandle itemHandle;
@@ -527,7 +537,7 @@ void OffsetDialogItemRect (DialogPtr theDialog, short item, short h, short v)
// clears the whole range of them but sets the one specified (as though<67>
// the radio buttons are linked and only one can be set at a time).
void SelectFromRadioGroup (DialogPtr dial, short which, short first, short last)
void SelectFromRadioGroup (Dialog *dial, short which, short first, short last)
{
Rect iRect;
ControlHandle iHandle;
@@ -547,7 +557,7 @@ void SelectFromRadioGroup (DialogPtr dial, short which, short first, short last)
// Assigns a menu handle to a pop-up dialog item - thus, giving that<61>
// pop-up item something to pop up.
/*
void AddMenuToPopUp (DialogPtr theDialog, short whichItem, MenuHandle theMenu)
void AddMenuToPopUp (Dialog *theDialog, short whichItem, MenuHandle theMenu)
{
Rect iRect;
Handle iHandle;
@@ -560,7 +570,7 @@ void AddMenuToPopUp (DialogPtr theDialog, short whichItem, MenuHandle theMenu)
//-------------------------------------------------------------- GetPopUpMenuValu
// Returns which item is currently selected in a pop-up menu.
void GetPopUpMenuValue (DialogPtr theDialog, short whichItem, short *value)
void GetPopUpMenuValue (Dialog *theDialog, short whichItem, short *value)
{
Rect iRect;
ControlHandle iHandle;
@@ -573,7 +583,7 @@ void GetPopUpMenuValue (DialogPtr theDialog, short whichItem, short *value)
//-------------------------------------------------------------- SetPopUpMenuValue
// Forces a specific item to be set (as though selected) in a pop-up menu.
void SetPopUpMenuValue (DialogPtr theDialog, short whichItem, short value)
void SetPopUpMenuValue (Dialog *theDialog, short whichItem, short value)
{
Rect iRect;
ControlHandle iHandle;
@@ -586,7 +596,7 @@ void SetPopUpMenuValue (DialogPtr theDialog, short whichItem, short value)
//-------------------------------------------------------------- MyEnableControl
// "Un-grays" or enables a dialog item (usually a button).
void MyEnableControl (DialogPtr theDialog, short whichItem)
void MyEnableControl (Dialog *theDialog, short whichItem)
{
Rect iRect;
ControlHandle iHandle;
@@ -599,7 +609,7 @@ void MyEnableControl (DialogPtr theDialog, short whichItem)
//-------------------------------------------------------------- MyDisableControl
// "Grays out" or disables a dialog item (usually a button).
void MyDisableControl (DialogPtr theDialog, short whichItem)
void MyDisableControl (Dialog *theDialog, short whichItem)
{
Rect iRect;
ControlHandle iHandle;
@@ -614,7 +624,7 @@ void MyDisableControl (DialogPtr theDialog, short whichItem)
// within the bounding rect of the item. Dialog item assumed to be<62>
// a "user item" (invisible item with only bounds).
void DrawDialogUserText (DialogPtr dial, short item, StringPtr text, Boolean invert)
void DrawDialogUserText (Dialog *dial, short item, StringPtr text, Boolean invert)
{
Rect iRect;
ControlHandle iHandle;
@@ -658,7 +668,7 @@ void DrawDialogUserText (DialogPtr dial, short item, StringPtr text, Boolean inv
// it truncates the string (and appends "<22>") to the end in order that<61>
// the string fits within the dialog item's bounds.
void DrawDialogUserText2 (DialogPtr dial, short item, StringPtr text)
void DrawDialogUserText2 (Dialog *dial, short item, StringPtr text)
{
Rect iRect;
ControlHandle iHandle;
@@ -681,7 +691,7 @@ void DrawDialogUserText2 (DialogPtr dial, short item, StringPtr text)
// Draws a 'PICT' specified by ID within the bounds of the specified<65>
// dialog item.
void LoadDialogPICT (DialogPtr theDialog, short item, short theID)
void LoadDialogPICT (Dialog *theDialog, short item, short theID)
{
Rect iRect;
ControlHandle iHandle;
@@ -697,7 +707,7 @@ void LoadDialogPICT (DialogPtr theDialog, short item, short theID)
//-------------------------------------------------------------- FrameDialogItem
// Given a dialog item, this function draws a box around it.
void FrameDialogItem (DialogPtr theDialog, short item)
void FrameDialogItem (Dialog *theDialog, short item)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -711,7 +721,7 @@ void FrameDialogItem (DialogPtr theDialog, short item)
//-------------------------------------------------------------- FrameDialogItemC
// Given a dialog item, this function draws a color (specified) box around it.
void FrameDialogItemC (DialogPtr theDialog, short item, long color)
void FrameDialogItemC (Dialog *theDialog, short item, long color)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -729,7 +739,7 @@ void FrameDialogItemC (DialogPtr theDialog, short item, long color)
//-------------------------------------------------------------- FrameOvalDialogItem
// Given a dialog item, this function draws an oval around it.
void FrameOvalDialogItem (DialogPtr theDialog, short item)
void FrameOvalDialogItem (Dialog *theDialog, short item)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -744,7 +754,7 @@ void FrameOvalDialogItem (DialogPtr theDialog, short item)
// Given a dialog item, this function draws any combination of 4 sides<65>
// of a box around it. Which sides get drawn is encoded in "sides".
void BorderDialogItem (DialogPtr theDialog, short item, short sides)
void BorderDialogItem (Dialog *theDialog, short item, short sides)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -791,7 +801,7 @@ void BorderDialogItem (DialogPtr theDialog, short item, short sides)
//-------------------------------------------------------------- ShadowDialogItem
// Draws a drop shadow to the right and below a specified dialog item.
void ShadowDialogItem (DialogPtr theDialog, short item, short thickness)
void ShadowDialogItem (Dialog *theDialog, short item, short thickness)
{
Rect itemRect;
ControlHandle itemHandle;
@@ -813,7 +823,7 @@ void ShadowDialogItem (DialogPtr theDialog, short item, short thickness)
//-------------------------------------------------------------- EraseDialogItem
// Erases (but doesn't physically remove) a dialog item.
void EraseDialogItem (DialogPtr theDialog, short item)
void EraseDialogItem (Dialog *theDialog, short item)
{
Rect itemRect;
ControlHandle itemHandle;

58
GpApp/DialogUtils.h
View File

@@ -8,7 +8,7 @@
#include "PLDialogs.h"
void BringUpDialog (DialogPtr *theDialog, short dialogID);
void BringUpDialog (Dialog **theDialog, short dialogID);
//void GetPutDialogCorner (Point *);
//void GetGetDialogCorner (Point *);
//void CenterDialog (short);
@@ -17,31 +17,31 @@ void GetDialogRect (Rect *, short);
//void CenterAlert (short);
//void ZoomOutDialogRect (short);
//void ZoomOutAlertRect (short);
void FlashDialogButton (DialogPtr, short);
void DrawDefaultButton (DialogPtr);
void GetDialogString (DialogPtr, short, StringPtr);
void SetDialogString (DialogPtr, short, const PLPasStr&);
short GetDialogStringLen (DialogPtr, short);
void GetDialogItemValue (DialogPtr, short, short *);
void SetDialogItemValue (DialogPtr, short, short);
void ToggleDialogItemValue (DialogPtr, short);
void SetDialogNumToStr (DialogPtr, short, long);
void GetDialogNumFromStr (DialogPtr, short, long *);
void GetDialogItemRect (DialogPtr, short, Rect *);
void SetDialogItemRect (DialogPtr, short, Rect *);
void OffsetDialogItemRect (DialogPtr, short, short, short);
void SelectFromRadioGroup (DialogPtr, short, short, short);
//void AddMenuToPopUp (DialogPtr, short, MenuHandle);
void GetPopUpMenuValue (DialogPtr, short, short *);
void SetPopUpMenuValue (DialogPtr, short, short);
void MyEnableControl(DialogPtr, short);
void MyDisableControl(DialogPtr, short);
void DrawDialogUserText (DialogPtr, short, StringPtr, Boolean);
void DrawDialogUserText2 (DialogPtr, short, StringPtr);
void LoadDialogPICT (DialogPtr, short, short);
void FrameDialogItem (DialogPtr, short);
void FrameDialogItemC (DialogPtr, short, long);
void FrameOvalDialogItem (DialogPtr, short);
void BorderDialogItem (DialogPtr, short, short);
void ShadowDialogItem (DialogPtr, short, short);
void EraseDialogItem (DialogPtr, short);
void FlashDialogButton (Dialog *, short);
void DrawDefaultButton (Dialog *);
void GetDialogString (Dialog *, short, StringPtr);
void SetDialogString (Dialog *, short, const PLPasStr&);
short GetDialogStringLen (Dialog *, short);
void GetDialogItemValue (Dialog *, short, short *);
void SetDialogItemValue (Dialog *, short, short);
void ToggleDialogItemValue (Dialog *, short);
void SetDialogNumToStr (Dialog *, short, long);
void GetDialogNumFromStr (Dialog *, short, long *);
void GetDialogItemRect (Dialog *, short, Rect *);
void SetDialogItemRect (Dialog *, short, Rect *);
void OffsetDialogItemRect (Dialog *, short, short, short);
void SelectFromRadioGroup (Dialog *, short, short, short);
//void AddMenuToPopUp (Dialog *, short, MenuHandle);
void GetPopUpMenuValue (Dialog *, short, short *);
void SetPopUpMenuValue (Dialog *, short, short);
void MyEnableControl(Dialog *, short);
void MyDisableControl(Dialog *, short);
void DrawDialogUserText (Dialog *, short, StringPtr, Boolean);
void DrawDialogUserText2 (Dialog *, short, StringPtr);
void LoadDialogPICT (Dialog *, short, short);
void FrameDialogItem (Dialog *, short);
void FrameDialogItemC (Dialog *, short, long);
void FrameOvalDialogItem (Dialog *, short);
void BorderDialogItem (Dialog *, short, short);
void ShadowDialogItem (Dialog *, short, short);
void EraseDialogItem (Dialog *, short);

20
GpApp/HighScores.cpp
View File

@@ -41,11 +41,11 @@ namespace PortabilityLayer
void DrawHighScores (DrawSurface *);
void UpdateNameDialog (DialogPtr);
Boolean NameFilter (DialogPtr, EventRecord *, short *);
void UpdateNameDialog (Dialog *);
Boolean NameFilter (Dialog *, EventRecord *, short *);
void GetHighScoreName (short);
void UpdateBannerDialog (DialogPtr);
Boolean BannerFilter (DialogPtr, EventRecord *, short *);
void UpdateBannerDialog (Dialog *);
Boolean BannerFilter (Dialog *, EventRecord *, short *);
void GetHighScoreBanner (void);
Boolean OpenHighScoresFile (const VFileSpec &spec, PortabilityLayer::IOStream *&outStream);
@@ -419,7 +419,7 @@ Boolean TestHighScore (void)
//-------------------------------------------------------------- UpdateNameDialog
// Redraws the "Enter High Score Name" dialog.
void UpdateNameDialog (DialogPtr theDialog)
void UpdateNameDialog (Dialog *theDialog)
{
short nChars;
@@ -433,7 +433,7 @@ void UpdateNameDialog (DialogPtr theDialog)
//-------------------------------------------------------------- NameFilter
// Dialog filter for the "Enter High Score Name" dialog.
Boolean NameFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean NameFilter (Dialog *dial, EventRecord *event, short *item)
{
short nChars;
@@ -487,7 +487,7 @@ Boolean NameFilter (DialogPtr dial, EventRecord *event, short *item)
void GetHighScoreName (short place)
{
DialogPtr theDial;
Dialog *theDial;
Str255 scoreStr, placeStr, tempStr;
short item;
Boolean leaving;
@@ -525,7 +525,7 @@ void GetHighScoreName (short place)
//-------------------------------------------------------------- UpdateBannerDialog
// Redraws the "Enter Message" dialog.
void UpdateBannerDialog (DialogPtr theDialog)
void UpdateBannerDialog (Dialog *theDialog)
{
short nChars;
@@ -539,7 +539,7 @@ void UpdateBannerDialog (DialogPtr theDialog)
//-------------------------------------------------------------- BannerFilter
// Dialog filter for the "Enter Message" dialog.
Boolean BannerFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean BannerFilter (Dialog *dial, EventRecord *event, short *item)
{
short nChars;
@@ -596,7 +596,7 @@ Boolean BannerFilter (DialogPtr dial, EventRecord *event, short *item)
void GetHighScoreBanner (void)
{
DialogPtr theDial;
Dialog *theDial;
Str255 tempStr;
short item;
Boolean leaving;

10
GpApp/House.cpp
View File

@@ -21,8 +21,8 @@
#define kGoToDialogID 1043
void UpdateGoToDialog (DialogPtr);
Boolean GoToFilter (DialogPtr, EventRecord *, short *);
void UpdateGoToDialog (Dialog *);
Boolean GoToFilter (Dialog *, EventRecord *, short *);
houseHand thisHouse;
@@ -593,7 +593,7 @@ void GenerateRetroLinks (void)
//-------------------------------------------------------------- UpdateGoToDialog
// Redraws the "Go To Room..." dialog.
void UpdateGoToDialog (DialogPtr theDialog)
void UpdateGoToDialog (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -603,7 +603,7 @@ void UpdateGoToDialog (DialogPtr theDialog)
//-------------------------------------------------------------- GoToFilter
// Dialog filter for the "Go To Room..." dialog.
Boolean GoToFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean GoToFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -647,7 +647,7 @@ Boolean GoToFilter (DialogPtr dial, EventRecord *event, short *item)
#define kGoToFSButt 4
#define kFloorEditText 5
#define kSuiteEditText 6
DialogPtr theDialog;
Dialog *theDialog;
long tempLong;
short item, roomToGoTo;
Boolean leaving, canceled;

10
GpApp/HouseInfo.cpp
View File

@@ -28,8 +28,8 @@
long CountTotalHousePoints (void);
void UpdateHouseInfoDialog (DialogPtr);
Boolean HouseFilter (DialogPtr, EventRecord *, short *);
void UpdateHouseInfoDialog (Dialog *);
Boolean HouseFilter (Dialog *, EventRecord *, short *);
Boolean WarnLockingHouse (void);
void HowToZeroScores (void);
@@ -103,7 +103,7 @@ long CountTotalHousePoints (void)
//-------------------------------------------------------------- UpdateHouseInfoDialog
void UpdateHouseInfoDialog (DialogPtr theDialog)
void UpdateHouseInfoDialog (Dialog *theDialog)
{
short nChars;
@@ -119,7 +119,7 @@ void UpdateHouseInfoDialog (DialogPtr theDialog)
//-------------------------------------------------------------- HouseFilter
Boolean HouseFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean HouseFilter (Dialog *dial, EventRecord *event, short *item)
{
Point mouseIs;
short nChars;
@@ -202,7 +202,7 @@ Boolean HouseFilter (DialogPtr dial, EventRecord *event, short *item)
void DoHouseInfo (void)
{
DialogPtr houseInfoDialog;
Dialog *houseInfoDialog;
Str255 versStr, loVers, nRoomsStr;
long h, v;
short item, numRooms, version;

2
GpApp/Input.cpp
View File

@@ -32,7 +32,7 @@ Boolean QuerySaveGame (void);
demoPtr demoData;
KeyMap theKeys;
DialogPtr saveDial;
Dialog *saveDial;
short demoIndex, batteryFrame;
Boolean isEscPauseKey, paused, batteryWasEngaged;

10
GpApp/Menu.cpp
View File

@@ -26,8 +26,8 @@ void UpdateMenusEditMode (void);
void UpdateMenusNonEditMode (void);
void UpdateMenusHouseOpen (void);
void UpdateMenusHouseClosed (void);
void UpdateResumeDialog (DialogPtr);
Boolean ResumeFilter (DialogPtr, EventRecord *, short *);
void UpdateResumeDialog (Dialog *);
Boolean ResumeFilter (Dialog *, EventRecord *, short *);
short QueryResumeGame (void);
void HeyYourPissingAHighScore (void);
@@ -659,7 +659,7 @@ void UpdateCoordinateCheckmark (Boolean checkIt)
//-------------------------------------------------------------- UpdateResumeDialog
// Update function for Resume dialog (below).
void UpdateResumeDialog (DialogPtr theDialog)
void UpdateResumeDialog (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -668,7 +668,7 @@ void UpdateResumeDialog (DialogPtr theDialog)
//-------------------------------------------------------------- ResumeFilter
// Dialog filter for the Resume dialog (below).
Boolean ResumeFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean ResumeFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -712,7 +712,7 @@ Boolean ResumeFilter (DialogPtr dial, EventRecord *event, short *item)
short QueryResumeGame (void)
{
#define kResumeGameDial 1025
DialogPtr theDial;
Dialog *theDial;
houseType *thisHousePtr;
Str255 scoreStr, glidStr;
long hadPoints;

130
GpApp/ObjectInfo.cpp
View File

@@ -65,32 +65,32 @@
#define kGotoButton2 14
void UpdateBlowerInfo (DialogPtr);
void UpdateFurnitureInfo (DialogPtr);
void UpdateCustPictInfo (DialogPtr);
void UpdateSwitchInfo (DialogPtr);
void UpdateTriggerInfo (DialogPtr);
void UpdateLightInfo (DialogPtr);
void UpdateApplianceInfo (DialogPtr);
void UpdateMicrowaveInfo (DialogPtr);
void UpdateGreaseInfo (DialogPtr);
void UpdateInvisBonusInfo (DialogPtr);
void UpdateTransInfo (DialogPtr);
void UpdateEnemyInfo (DialogPtr);
void UpdateFlowerInfo (DialogPtr);
Boolean BlowerFilter (DialogPtr, EventRecord *, short *);
Boolean FurnitureFilter (DialogPtr, EventRecord *, short *);
Boolean CustPictFilter (DialogPtr, EventRecord *, short *);
Boolean SwitchFilter (DialogPtr, EventRecord *, short *);
Boolean TriggerFilter (DialogPtr, EventRecord *, short *);
Boolean LightFilter (DialogPtr, EventRecord *, short *);
Boolean ApplianceFilter (DialogPtr, EventRecord *, short *);
Boolean MicrowaveFilter (DialogPtr, EventRecord *, short *);
Boolean GreaseFilter (DialogPtr, EventRecord *, short *);
Boolean InvisBonusFilter (DialogPtr, EventRecord *, short *);
Boolean TransFilter (DialogPtr, EventRecord *, short *);
Boolean EnemyFilter (DialogPtr, EventRecord *, short *);
Boolean FlowerFilter (DialogPtr, EventRecord *, short *);
void UpdateBlowerInfo (Dialog *);
void UpdateFurnitureInfo (Dialog *);
void UpdateCustPictInfo (Dialog *);
void UpdateSwitchInfo (Dialog *);
void UpdateTriggerInfo (Dialog *);
void UpdateLightInfo (Dialog *);
void UpdateApplianceInfo (Dialog *);
void UpdateMicrowaveInfo (Dialog *);
void UpdateGreaseInfo (Dialog *);
void UpdateInvisBonusInfo (Dialog *);
void UpdateTransInfo (Dialog *);
void UpdateEnemyInfo (Dialog *);
void UpdateFlowerInfo (Dialog *);
Boolean BlowerFilter (Dialog *, EventRecord *, short *);
Boolean FurnitureFilter (Dialog *, EventRecord *, short *);
Boolean CustPictFilter (Dialog *, EventRecord *, short *);
Boolean SwitchFilter (Dialog *, EventRecord *, short *);
Boolean TriggerFilter (Dialog *, EventRecord *, short *);
Boolean LightFilter (Dialog *, EventRecord *, short *);
Boolean ApplianceFilter (Dialog *, EventRecord *, short *);
Boolean MicrowaveFilter (Dialog *, EventRecord *, short *);
Boolean GreaseFilter (Dialog *, EventRecord *, short *);
Boolean InvisBonusFilter (Dialog *, EventRecord *, short *);
Boolean TransFilter (Dialog *, EventRecord *, short *);
Boolean EnemyFilter (Dialog *, EventRecord *, short *);
Boolean FlowerFilter (Dialog *, EventRecord *, short *);
void DoBlowerObjectInfo (short);
void DoFurnitureObjectInfo (void);
void DoCustPictObjectInfo (void);
@@ -120,7 +120,7 @@ extern Boolean linkerIsSwitch;
//============================================================== Functions
//-------------------------------------------------------------- UpdateBlowerInfo
void UpdateBlowerInfo (DialogPtr theDialog)
void UpdateBlowerInfo (Dialog *theDialog)
{
#define kArrowheadLength 4
Rect bounds;
@@ -232,7 +232,7 @@ void UpdateBlowerInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateFurnitureInfo
void UpdateFurnitureInfo (DialogPtr theDialog)
void UpdateFurnitureInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -241,7 +241,7 @@ void UpdateFurnitureInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateCustPictInfo
void UpdateCustPictInfo (DialogPtr theDialog)
void UpdateCustPictInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -250,7 +250,7 @@ void UpdateCustPictInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateSwitchInfo
void UpdateSwitchInfo (DialogPtr theDialog)
void UpdateSwitchInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -262,7 +262,7 @@ void UpdateSwitchInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateTriggerInfo
void UpdateTriggerInfo (DialogPtr theDialog)
void UpdateTriggerInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -272,7 +272,7 @@ void UpdateTriggerInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateLightInfo
void UpdateLightInfo (DialogPtr theDialog)
void UpdateLightInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -281,7 +281,7 @@ void UpdateLightInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateApplianceInfo
void UpdateApplianceInfo (DialogPtr theDialog)
void UpdateApplianceInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -290,7 +290,7 @@ void UpdateApplianceInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateMicrowaveInfo
void UpdateMicrowaveInfo (DialogPtr theDialog)
void UpdateMicrowaveInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -299,7 +299,7 @@ void UpdateMicrowaveInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateGreaseInfo
void UpdateGreaseInfo (DialogPtr theDialog)
void UpdateGreaseInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -308,7 +308,7 @@ void UpdateGreaseInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateInvisBonusInfo
void UpdateInvisBonusInfo (DialogPtr theDialog)
void UpdateInvisBonusInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -319,7 +319,7 @@ void UpdateInvisBonusInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateTransInfo
void UpdateTransInfo (DialogPtr theDialog)
void UpdateTransInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -329,7 +329,7 @@ void UpdateTransInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateEnemyInfo
void UpdateEnemyInfo (DialogPtr theDialog)
void UpdateEnemyInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -338,7 +338,7 @@ void UpdateEnemyInfo (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateFlowerInfo
void UpdateFlowerInfo (DialogPtr theDialog)
void UpdateFlowerInfo (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -347,7 +347,7 @@ void UpdateFlowerInfo (DialogPtr theDialog)
//-------------------------------------------------------------- BlowerFilter
Boolean BlowerFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean BlowerFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -401,7 +401,7 @@ Boolean BlowerFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- FurnitureFilter
Boolean FurnitureFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean FurnitureFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -436,7 +436,7 @@ Boolean FurnitureFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- CustPictFilter
Boolean CustPictFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean CustPictFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -471,7 +471,7 @@ Boolean CustPictFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- SwitchFilter
Boolean SwitchFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean SwitchFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -512,7 +512,7 @@ Boolean SwitchFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- TriggerFilter
Boolean TriggerFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean TriggerFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -558,7 +558,7 @@ Boolean TriggerFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- LightFilter
Boolean LightFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean LightFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -607,7 +607,7 @@ Boolean LightFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- ApplianceFilter
Boolean ApplianceFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean ApplianceFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -661,7 +661,7 @@ Boolean ApplianceFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- MicrowaveFilter
Boolean MicrowaveFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean MicrowaveFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -710,7 +710,7 @@ Boolean MicrowaveFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- GreaseFilter
Boolean GreaseFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean GreaseFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -751,7 +751,7 @@ Boolean GreaseFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- InvisBonusFilter
Boolean InvisBonusFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean InvisBonusFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -786,7 +786,7 @@ Boolean InvisBonusFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- TransFilter
Boolean TransFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean TransFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -827,7 +827,7 @@ Boolean TransFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- EnemyFilter
Boolean EnemyFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean EnemyFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -881,7 +881,7 @@ Boolean EnemyFilter (DialogPtr dial, EventRecord *event, short *item)
//-------------------------------------------------------------- EnemyFilter
Boolean FlowerFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean FlowerFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -932,7 +932,7 @@ Boolean FlowerFilter (DialogPtr dial, EventRecord *event, short *item)
void DoBlowerObjectInfo (short what)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr, distStr;
short item, initial;
Boolean leaving, doReturn, leftFacing;
@@ -1105,7 +1105,7 @@ void DoBlowerObjectInfo (short what)
void DoFurnitureObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item;
Boolean leaving, doReturn;
@@ -1170,7 +1170,7 @@ void DoFurnitureObjectInfo (void)
void DoCustPictObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
long wasPict;
short item;
@@ -1267,7 +1267,7 @@ void DoCustPictObjectInfo (void)
void DoSwitchObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr, roomStr, tempStr, objStr;
short item, floor, suite;
Boolean leaving, doLink, doGoTo, doReturn;
@@ -1389,7 +1389,7 @@ void DoSwitchObjectInfo (void)
void DoTriggerObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr, roomStr, tempStr, objStr;
long delayIs;
short item, floor, suite;
@@ -1545,7 +1545,7 @@ void DoTriggerObjectInfo (void)
void DoLightObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item, initial;
Boolean leaving, doReturn;
@@ -1631,7 +1631,7 @@ void DoLightObjectInfo (void)
void DoApplianceObjectInfo (short what)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
long delay;
short item, initial;
@@ -1747,7 +1747,7 @@ void DoApplianceObjectInfo (short what)
void DoMicrowaveObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item, initial, kills;
Boolean leaving, doReturn;
@@ -1871,7 +1871,7 @@ void DoMicrowaveObjectInfo (void)
void DoGreaseObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item;
Boolean leaving, wasSpilled, doReturn;
@@ -1945,7 +1945,7 @@ void DoGreaseObjectInfo (void)
void DoInvisBonusObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item;
Boolean leaving, doReturn;
@@ -2058,7 +2058,7 @@ void DoInvisBonusObjectInfo (void)
void DoTransObjectInfo (short what)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr, roomStr, tempStr, objStr;
short item, floor, suite;
Boolean leaving, doLink, doGoTo, doReturn, wasState;
@@ -2181,7 +2181,7 @@ void DoTransObjectInfo (short what)
void DoEnemyObjectInfo (short what)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
long delay;
short item, initial;
@@ -2291,7 +2291,7 @@ void DoEnemyObjectInfo (short what)
void DoFlowerObjectInfo (void)
{
DialogPtr infoDial;
Dialog *infoDial;
Str255 numberStr, kindStr;
short item, flower;
Boolean leaving, doReturn;

2
GpApp/Play.cpp
View File

@@ -247,7 +247,7 @@ void NewGame (short mode)
}
NilSavedMaps();
SetPortWindowPort(mainWindow);
BlackenScoreboard(mainWindow->GetDrawSurface());
UpdateMenus(false);
if (!gameOver)

20
GpApp/RoomInfo.cpp
View File

@@ -38,13 +38,13 @@
#define kFloorSupportCheck 12
void UpdateRoomInfoDialog (DialogPtr);
void UpdateRoomInfoDialog (Dialog *);
void DragMiniTile (DrawSurface *, Point, short *);
void HiliteTileOver (DrawSurface *, Point);
Boolean RoomFilter (DialogPtr, EventRecord *, short *);
Boolean RoomFilter (Dialog *, EventRecord *, short *);
short ChooseOriginalArt (short);
void UpdateOriginalArt (DialogPtr);
Boolean OriginalArtFilter (DialogPtr, EventRecord *, short *);
void UpdateOriginalArt (Dialog *);
Boolean OriginalArtFilter (Dialog *, EventRecord *, short *);
Boolean PictIDExists (short);
short GetFirstPICT (void);
void BitchAboutPICTNotFound (void);
@@ -66,7 +66,7 @@ extern short houseResFork, lastBackground;
//-------------------------------------------------------------- UpdateRoomInfoDialog
#ifndef COMPILEDEMO
void UpdateRoomInfoDialog (DialogPtr theDialog)
void UpdateRoomInfoDialog (Dialog *theDialog)
{
Rect src, dest;
short i;
@@ -346,7 +346,7 @@ void HiliteTileOver (DrawSurface *surface, Point mouseIs)
//-------------------------------------------------------------- RoomFilter
#ifndef COMPILEDEMO
Boolean RoomFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean RoomFilter (Dialog *dial, EventRecord *event, short *item)
{
Point mouseIs;
short newTileOver;
@@ -428,7 +428,7 @@ void DoRoomInfo (void)
{
#ifndef COMPILEDEMO
#define kBackgroundsMenuID 140
DialogPtr roomInfoDialog;
Dialog *roomInfoDialog;
MenuHandle backgroundsMenu;
Str255 floorStr, suiteStr, objectsStr, tempStr;
short item, i, newBack;
@@ -609,7 +609,7 @@ void DoRoomInfo (void)
//-------------------------------------------------------------- UpdateOriginalArt
#ifndef COMPILEDEMO
void UpdateOriginalArt (DialogPtr theDialog)
void UpdateOriginalArt (Dialog *theDialog)
{
Pattern dummyPattern;
@@ -663,7 +663,7 @@ void UpdateOriginalArt (DialogPtr theDialog)
//-------------------------------------------------------------- OriginalArtFilter
#ifndef COMPILEDEMO
Boolean OriginalArtFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean OriginalArtFilter (Dialog *dial, EventRecord *event, short *item)
{
Point mouseIs;
@@ -746,7 +746,7 @@ Boolean OriginalArtFilter (DialogPtr dial, EventRecord *event, short *item)
#ifndef COMPILEDEMO
short ChooseOriginalArt (short was)
{
DialogPtr theDialog;
Dialog *theDialog;
long longID;
short item, newPictID, tempShort, wasPictID;
Boolean leaving;

18
GpApp/SelectHouse.cpp
View File

@@ -39,10 +39,10 @@
#define kMaxExtraHouses 8
void UpdateLoadDialog (DialogPtr);
void PageUpHouses (DialogPtr);
void PageDownHouses (DialogPtr);
Boolean LoadFilter (DialogPtr, EventRecord *, short *);
void UpdateLoadDialog (Dialog *);
void PageUpHouses (Dialog *);
void PageDownHouses (Dialog *);
Boolean LoadFilter (Dialog *, EventRecord *, short *);
void SortHouseList (void);
void DoDirSearch (void);
@@ -63,7 +63,7 @@ extern UInt32 doubleTime;
//-------------------------------------------------------------- UpdateLoadWindow
#ifndef COMPILEDEMO
void UpdateLoadDialog (DialogPtr theDialog)
void UpdateLoadDialog (Dialog *theDialog)
{
Rect tempRect, dialogRect, dummyRect;
short houseStart, houseStop, i, wasResFile, isResFile, count;
@@ -138,7 +138,7 @@ void UpdateLoadDialog (DialogPtr theDialog)
//-------------------------------------------------------------- PageUpHouses
#ifndef COMPILEDEMO
void PageUpHouses (DialogPtr theDial)
void PageUpHouses (Dialog *theDial)
{
Rect tempRect;
DrawSurface *surface = theDial->GetWindow()->GetDrawSurface();
@@ -172,7 +172,7 @@ void PageUpHouses (DialogPtr theDial)
//-------------------------------------------------------------- PageDownHouses
#ifndef COMPILEDEMO
void PageDownHouses (DialogPtr theDial)
void PageDownHouses (Dialog *theDial)
{
Rect tempRect;
DrawSurface *surface = theDial->GetWindow()->GetDrawSurface();
@@ -205,7 +205,7 @@ void PageDownHouses (DialogPtr theDial)
//-------------------------------------------------------------- LoadFilter
#ifndef COMPILEDEMO
Boolean LoadFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean LoadFilter (Dialog *dial, EventRecord *event, short *item)
{
short screenCount, i, wasIndex;
@@ -364,7 +364,7 @@ Boolean LoadFilter (DialogPtr dial, EventRecord *event, short *item)
void DoLoadHouse (void)
{
Rect tempRect;
DialogPtr theDial;
Dialog *theDial;
short i, item, wasIndex, screenCount;
Boolean leaving, whoCares;
ModalFilterUPP loadFilterUPP;

70
GpApp/Settings.cpp
View File

@@ -59,29 +59,29 @@
#define kDoBitchDlgsCheck 14
void SetBrainsToDefaults (DialogPtr);
void UpdateSettingsBrains (DialogPtr);
Boolean BrainsFilter (DialogPtr, EventRecord *, short *);
void SetBrainsToDefaults (Dialog *);
void UpdateSettingsBrains (Dialog *);
Boolean BrainsFilter (Dialog *, EventRecord *, short *);
void DoBrainsPrefs (void);
void SetControlsToDefaults (DialogPtr);
void UpdateControlKeyName (DialogPtr);
void UpdateSettingsControl (DialogPtr);
Boolean ControlFilter (DialogPtr, EventRecord *, short *);
void SetControlsToDefaults (Dialog *);
void UpdateControlKeyName (Dialog *);
void UpdateSettingsControl (Dialog *);
Boolean ControlFilter (Dialog *, EventRecord *, short *);
void DoControlPrefs (void);
void SoundDefaults (DialogPtr);
void UpdateSettingsSound (DialogPtr);
void SoundDefaults (Dialog *);
void UpdateSettingsSound (Dialog *);
void HandleSoundMusicChange (short, Boolean);
Boolean SoundFilter (DialogPtr, EventRecord *, short *);
Boolean SoundFilter (Dialog *, EventRecord *, short *);
void DoSoundPrefs (void);
void DisplayDefaults (void);
void FrameDisplayIcon (DialogPtr);
void DisplayUpdate (DialogPtr);
Boolean DisplayFilter (DialogPtr, EventRecord *, short *);
void FrameDisplayIcon (Dialog *);
void DisplayUpdate (Dialog *);
Boolean DisplayFilter (Dialog *, EventRecord *, short *);
void DoDisplayPrefs (void);
void SetAllDefaults (void);
void FlashSettingsButton (short);
void UpdateSettingsMain (DialogPtr);
Boolean PrefsFilter (DialogPtr, EventRecord *, short *);
void UpdateSettingsMain (Dialog *);
Boolean PrefsFilter (Dialog *, EventRecord *, short *);
void BitchAboutChanges (void);
@@ -105,7 +105,7 @@ extern Boolean changeLockStateOfHouse, saveHouseLocked, doPrettyMap;
//============================================================== Functions
//-------------------------------------------------------------- SetBrainsToDefaults
void SetBrainsToDefaults (DialogPtr theDialog)
void SetBrainsToDefaults (Dialog *theDialog)
{
SetDialogNumToStr(theDialog, kMaxFilesItem, 24L);
#ifdef powerc
@@ -130,7 +130,7 @@ void SetBrainsToDefaults (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateSettingsBrains
void UpdateSettingsBrains (DialogPtr theDialog)
void UpdateSettingsBrains (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -143,7 +143,7 @@ void UpdateSettingsBrains (DialogPtr theDialog)
//-------------------------------------------------------------- BrainsFilter
Boolean BrainsFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean BrainsFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -221,7 +221,7 @@ Boolean BrainsFilter (DialogPtr dial, EventRecord *event, short *item)
void DoBrainsPrefs (void)
{
DialogPtr prefDlg;
Dialog *prefDlg;
long tempLong;
short itemHit, wasMaxFiles;
Boolean leaving;
@@ -325,7 +325,7 @@ void DoBrainsPrefs (void)
//-------------------------------------------------------------- SetControlsToDefaults
void SetControlsToDefaults (DialogPtr theDialog)
void SetControlsToDefaults (Dialog *theDialog)
{
PasStringCopy(PSTR("lf arrow"), tempLeftStr);
PasStringCopy(PSTR("rt arrow"), tempRightStr);
@@ -342,7 +342,7 @@ void SetControlsToDefaults (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateControlKeyName
void UpdateControlKeyName (DialogPtr theDialog)
void UpdateControlKeyName (Dialog *theDialog)
{
DrawDialogUserText(theDialog, kRightControl + 4, tempRightStr, whichCtrl == 0);
DrawDialogUserText(theDialog, kLeftControl + 4, tempLeftStr, whichCtrl == 1);
@@ -352,7 +352,7 @@ void UpdateControlKeyName (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateSettingsControl
void UpdateSettingsControl (DialogPtr theDialog)
void UpdateSettingsControl (Dialog *theDialog)
{
short i;
DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
@@ -385,7 +385,7 @@ void UpdateSettingsControl (DialogPtr theDialog)
//-------------------------------------------------------------- ControlFilter
Boolean ControlFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean ControlFilter (Dialog *dial, EventRecord *event, short *item)
{
intptr_t wasKeyMap;
@@ -508,7 +508,7 @@ Boolean ControlFilter (DialogPtr dial, EventRecord *event, short *item)
void DoControlPrefs (void)
{
DialogPtr prefDlg;
Dialog *prefDlg;
short i, itemHit;
Boolean leaving;
ModalFilterUPP controlFilterUPP;
@@ -614,7 +614,7 @@ void DoControlPrefs (void)
//-------------------------------------------------------------- SoundDefaults
void SoundDefaults (DialogPtr theDialog)
void SoundDefaults (Dialog *theDialog)
{
wasIdle = true;
wasPlay = true;
@@ -627,7 +627,7 @@ void SoundDefaults (DialogPtr theDialog)
//-------------------------------------------------------------- UpdateSettingsSound
void UpdateSettingsSound (DialogPtr theDialog)
void UpdateSettingsSound (Dialog *theDialog)
{
short howLoudNow;
@@ -676,7 +676,7 @@ void HandleSoundMusicChange (short newVolume, Boolean sayIt)
//-------------------------------------------------------------- SoundFilter
Boolean SoundFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean SoundFilter (Dialog *dial, EventRecord *event, short *item)
{
short newVolume;
@@ -772,7 +772,7 @@ Boolean SoundFilter (DialogPtr dial, EventRecord *event, short *item)
void DoSoundPrefs (void)
{
Rect tempRect;
DialogPtr prefDlg;
Dialog *prefDlg;
short wasLoudness, tempVolume;
PLError_t theErr;
short itemHit;
@@ -907,7 +907,7 @@ void DisplayDefaults (void)
//-------------------------------------------------------------- FrameDisplayIcon
void FrameDisplayIcon (DialogPtr theDialog)
void FrameDisplayIcon (Dialog *theDialog)
{
Rect theRect;
@@ -941,7 +941,7 @@ void FrameDisplayIcon (DialogPtr theDialog)
//-------------------------------------------------------------- DisplayUpdate
void DisplayUpdate (DialogPtr theDialog)
void DisplayUpdate (Dialog *theDialog)
{
DrawDialog(theDialog);
DrawDefaultButton(theDialog);
@@ -962,7 +962,7 @@ void DisplayUpdate (DialogPtr theDialog)
//-------------------------------------------------------------- DisplayFilter
Boolean DisplayFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean DisplayFilter (Dialog *dial, EventRecord *event, short *item)
{
switch (event->what)
{
@@ -1118,7 +1118,7 @@ Boolean DisplayFilter (DialogPtr dial, EventRecord *event, short *item)
void DoDisplayPrefs (void)
{
DialogPtr prefDlg;
Dialog *prefDlg;
short itemHit, wasNeighbors;
Boolean leaving;
ModalFilterUPP displayFilterUPP;
@@ -1297,7 +1297,7 @@ void FlashSettingsButton (short who)
//-------------------------------------------------------------- UpdateSettingsMain
void UpdateSettingsMain (DialogPtr theDialog)
void UpdateSettingsMain (Dialog *theDialog)
{
Str255 theStr;
DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
@@ -1323,7 +1323,7 @@ void UpdateSettingsMain (DialogPtr theDialog)
//-------------------------------------------------------------- PrefsFilter
Boolean PrefsFilter (DialogPtr dial, EventRecord *event, short *item)
Boolean PrefsFilter (Dialog *dial, EventRecord *event, short *item)
{
Point testPt;
short i;
@@ -1410,7 +1410,7 @@ Boolean PrefsFilter (DialogPtr dial, EventRecord *event, short *item)
void DoSettingsMain (void)
{
#define kAllDefaultsButton 11
DialogPtr prefDlg;
Dialog *prefDlg;
short itemHit;
Boolean leaving;
ModalFilterUPP prefsFilterUPP;