Clean up language so we can bundle source without getting dinged on age rating.

This commit is contained in:
elasota
2020-11-06 17:51:19 -05:00
parent a13f90bd71
commit 4c6e646133
10 changed files with 29 additions and 56 deletions

View File

@@ -20,7 +20,6 @@
#include "WindowManager.h"
short BitchAboutColorDepth (void);
void HandleMouseEvent (const GpMouseInputEvent &, uint32_t);
void HandleKeyEvent (const KeyDownStates &keyStates, const GpKeyboardInputEvent &);
void HandleUpdateEvent (EventRecord *);
@@ -45,20 +44,6 @@ extern Boolean autoRoomEdit, newRoomNow, isPlayMusicIdle;
//============================================================== Functions
//-------------------------------------------------------------- BitchAboutColorDepth
// Display a dialog that alerts the user that they have switched the bit<69>
// depth of the monitor under our noses. They must return it to previous.
short BitchAboutColorDepth (void)
{
#define kColorSwitchedAlert 1042
short sheSaid;
// CenterAlert(kColorSwitchedAlert);
sheSaid = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kColorSwitchedAlert, nullptr);
return (sheSaid);
}
//-------------------------------------------------------------- HandleMouseEvent
// Handle a mouse click event.

View File

@@ -118,7 +118,7 @@ typedef struct
Boolean wasEscPauseKey;
Boolean wasDoAutoDemo, wasAutoScale;
Boolean wasDoBackground, wasHouseChecks;
Boolean wasPrettyMap, wasBitchDialogs;
Boolean wasPrettyMap, wasComplainDialogs;
Boolean wasUseICCProfile;
} prefsInfo;

View File

@@ -461,7 +461,6 @@ void DumpTriggerSound (void);
void InitSound (void);
void KillSound (void);
void TellHerNoSounds (void);
void BitchAboutSM3 (void);
void InitScoreboardMap (void); // --- StructuresInit.c
void InitGliderMap (void);

View File

@@ -71,7 +71,7 @@ extern Boolean isMusicOn, isSoundOn, isPlayMusicIdle, isHouseChecks;
extern Boolean houseOpen, isDoColorFade, isEscPauseKey;
extern Boolean autoRoomEdit, doAutoDemo, doBackground;
extern Boolean isMapOpen, isToolsOpen, isCoordOpen;
extern Boolean doPrettyMap, doBitchDialogs;
extern Boolean doPrettyMap, doComplainDialogs;
//extern Boolean didValidation;
THandle<void> globalModulePrefs;
@@ -159,7 +159,7 @@ void ReadInPrefs (void)
isUseICCProfile = thePrefs.wasUseICCProfile;
doBackground = thePrefs.wasDoBackground;
doPrettyMap = thePrefs.wasPrettyMap;
doBitchDialogs = thePrefs.wasBitchDialogs;
doComplainDialogs = thePrefs.wasComplainDialogs;
if (modulePrefs)
ApplyModulePrefs(&modulePrefs);
@@ -244,7 +244,7 @@ void ReadInPrefs (void)
isUseICCProfile = true;
doBackground = false;
doPrettyMap = false;
doBitchDialogs = true;
doComplainDialogs = true;
IGpDisplayDriver *displayDriver = PortabilityLayer::HostDisplayDriver::GetInstance();
if (!displayDriver->IsFullScreen())
@@ -345,7 +345,7 @@ void WriteOutPrefs (void)
thePrefs.wasUseICCProfile = isUseICCProfile;
thePrefs.wasDoBackground = doBackground;
thePrefs.wasPrettyMap = doPrettyMap;
thePrefs.wasBitchDialogs = doBitchDialogs;
thePrefs.wasComplainDialogs = doComplainDialogs;
THandle<void> modulePrefs;

View File

@@ -53,7 +53,7 @@ short isMapH, isMapV, mapRoomsHigh, mapRoomsWide;
short mapLeftRoom, mapTopRoom;
Boolean isMapOpen, doPrettyMap;
extern Boolean doBitchDialogs;
extern Boolean doComplainDialogs;
//============================================================== Functions
@@ -651,7 +651,7 @@ void HandleMapClick (const GpMouseInputEvent &theEvent)
}
else
{
if (doBitchDialogs)
if (doComplainDialogs)
{
if (QueryNewRoom())
{

View File

@@ -35,7 +35,7 @@ short numberRooms, thisRoomNumber, previousRoom;
short leftThresh, rightThresh, lastBackground;
Boolean autoRoomEdit, newRoomNow, noRoomAtAll;
Boolean leftOpen, rightOpen, topOpen, bottomOpen;
Boolean doBitchDialogs;
Boolean doComplainDialogs;
extern short tempTiles[];

View File

@@ -54,7 +54,7 @@ void UpdateOriginalArt (Dialog *);
int16_t OriginalArtFilter (void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
Boolean PictIDExists (short);
short GetFirstPICT (void);
void BitchAboutPICTNotFound (void);
void ComplainAboutPICTNotFound (void);
Rect tileSrc, tileDest, tileSrcRect, editTETextBox;
@@ -441,7 +441,7 @@ void DoRoomInfo(void)
// SetPort((GrafPtr)tileSrcMap);
if ((tempBack > kStars) && (!PictIDExists(tempBack)))
{
BitchAboutPICTNotFound();
ComplainAboutPICTNotFound();
tempBack = kSimpleRoom;
}
if ((tempBack == 2002) || (tempBack == 2011) ||
@@ -869,10 +869,10 @@ short GetFirstPICT (void)
return resID;
}
//-------------------------------------------------------------- BitchAboutPICTNotFound
//-------------------------------------------------------------- ComplainAboutPICTNotFound
#ifndef COMPILEDEMO
void BitchAboutPICTNotFound (void)
void ComplainAboutPICTNotFound (void)
{
short hitWhat;

View File

@@ -72,7 +72,7 @@
#define kDoBackgroundCheck 11
#define kDoErrorCheck 12
#define kDoPrettyMapCheck 13
#define kDoBitchDlgsCheck 14
#define kDoComplainDlgsCheck 14
void SetBrainsToDefaults (Dialog *);
@@ -98,7 +98,7 @@ void SetAllDefaults (void);
void FlashSettingsButton (DrawSurface *, short);
void UpdateSettingsMain (Dialog *);
int16_t PrefsFilter(void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
void BitchAboutChanges (void);
void ComplainAboutChanges (void);
void WriteOutPrefs (void);
@@ -109,11 +109,11 @@ long tempLeftMap, tempRightMap, tempBattMap, tempBandMap;
short whichCtrl, wasDepthPref;
Boolean wasFade, wasIdle, wasPlay, wasTransit, wasZooms, wasBackground;
Boolean wasEscPauseKey, wasDemos, wasAutoScale, wasUseICCProfile, nextRestartChange, wasErrorCheck, wasFullscreenPref, needResolutionReset;
Boolean wasPrettyMap, wasBitchDialogs;
Boolean wasPrettyMap, wasComplainDialogs;
extern short numNeighbors, isDepthPref, maxFiles, willMaxFiles;
extern Boolean isDoColorFade, isPlayMusicIdle, isAutoScale, isUseICCProfile;
extern Boolean isHouseChecks, doBitchDialogs;
extern Boolean isHouseChecks, doComplainDialogs;
extern Boolean isEscPauseKey, failedMusic, isSoundOn, doBackground;
extern Boolean isMusicOn, quickerTransitions, doAutoDemo;
extern Boolean changeLockStateOfHouse, saveHouseLocked, doPrettyMap;
@@ -135,14 +135,14 @@ void SetBrainsToDefaults (Dialog *theDialog)
wasBackground = false;
wasErrorCheck = true;
wasPrettyMap = true;
wasBitchDialogs = true;
wasComplainDialogs = true;
SetDialogItemValue(theDialog, kQuickTransitCheck, (short)wasTransit);
SetDialogItemValue(theDialog, kDoZoomsCheck, (short)wasZooms);
SetDialogItemValue(theDialog, kDoDemoCheck, (short)wasDemos);
SetDialogItemValue(theDialog, kDoBackgroundCheck, (short)wasBackground);
SetDialogItemValue(theDialog, kDoErrorCheck, (short)wasErrorCheck);
SetDialogItemValue(theDialog, kDoPrettyMapCheck, (short)wasPrettyMap);
SetDialogItemValue(theDialog, kDoBitchDlgsCheck, (short)wasBitchDialogs);
SetDialogItemValue(theDialog, kDoComplainDlgsCheck, (short)wasComplainDialogs);
}
//-------------------------------------------------------------- UpdateSettingsBrains
@@ -238,7 +238,7 @@ void DoBrainsPrefs (void)
wasBackground = doBackground;
wasErrorCheck = isHouseChecks;
wasPrettyMap = doPrettyMap;
wasBitchDialogs = doBitchDialogs;
wasComplainDialogs = doComplainDialogs;
SetDialogItemValue(prefDlg, kQuickTransitCheck, (short)wasTransit);
SetDialogItemValue(prefDlg, kDoZoomsCheck, (short)wasZooms);
@@ -246,7 +246,7 @@ void DoBrainsPrefs (void)
SetDialogItemValue(prefDlg, kDoBackgroundCheck, (short)wasBackground);
SetDialogItemValue(prefDlg, kDoErrorCheck, (short)wasErrorCheck);
SetDialogItemValue(prefDlg, kDoPrettyMapCheck, (short)wasPrettyMap);
SetDialogItemValue(prefDlg, kDoBitchDlgsCheck, (short)wasBitchDialogs);
SetDialogItemValue(prefDlg, kDoComplainDlgsCheck, (short)wasComplainDialogs);
UpdateSettingsBrains(prefDlg);
@@ -272,7 +272,7 @@ void DoBrainsPrefs (void)
doBackground = wasBackground;
isHouseChecks = wasErrorCheck;
doPrettyMap = wasPrettyMap;
doBitchDialogs = wasBitchDialogs;
doComplainDialogs = wasComplainDialogs;
leaving = true;
break;
@@ -315,9 +315,9 @@ void DoBrainsPrefs (void)
SetDialogItemValue(prefDlg, kDoPrettyMapCheck, (short)wasPrettyMap);
break;
case kDoBitchDlgsCheck:
wasBitchDialogs = !wasBitchDialogs;
SetDialogItemValue(prefDlg, kDoBitchDlgsCheck, (short)wasBitchDialogs);
case kDoComplainDlgsCheck:
wasComplainDialogs = !wasComplainDialogs;
SetDialogItemValue(prefDlg, kDoComplainDlgsCheck, (short)wasComplainDialogs);
break;
}
}
@@ -1121,7 +1121,7 @@ void SetAllDefaults (void)
doBackground = false;
isHouseChecks = true;
doPrettyMap = true;
doBitchDialogs = true;
doComplainDialogs = true;
// Default control settings
PasStringCopy(PSTR("lf arrow"), leftName);
PasStringCopy(PSTR("rt arrow"), rightName);
@@ -1340,7 +1340,7 @@ void DoSettingsMain (void)
if (nextRestartChange)
{
BitchAboutChanges();
ComplainAboutChanges();
nextRestartChange = false;
}
@@ -1363,9 +1363,9 @@ void DoSettingsMain (void)
WriteOutPrefs();
}
//-------------------------------------------------------------- BitchAboutChanges
//-------------------------------------------------------------- ComplainAboutChanges
void BitchAboutChanges (void)
void ComplainAboutChanges (void)
{
#define kChangesEffectAlert 1040
short hitWhat;

View File

@@ -378,17 +378,6 @@ void TellHerNoSounds (void)
hitWhat = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kNoMemForSoundsAlert, nullptr);
}
//-------------------------------------------------------------- BitchAboutSM3
void BitchAboutSM3 (void)
{
#define kNoSoundManager3Alert 1030
short hitWhat;
// CenterAlert(kNoSoundManager3Alert);
hitWhat = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kNoSoundManager3Alert, nullptr);
}
//-------------------------------------------------------------- ParseAndConvertSound

View File

@@ -52,7 +52,7 @@ bool LZWDecompressor::ReadBytes(void *dest, size_t numBytes)
symbolcounter++;
if (symbol == 256 && blockmode)
{
// Skip garbage data after a clear. God damn, this is dumb.
// Skip garbage data after a clear.
int symbolsize = LZWSuggestedSymbolSize(lzw);
if (symbolcounter % 8)
{