diff --git a/ApplicationResourcePatches/PICT/1973.bmp b/ApplicationResourcePatches/PICT/1973.bmp index 8ca08e9..4093f47 100644 Binary files a/ApplicationResourcePatches/PICT/1973.bmp and b/ApplicationResourcePatches/PICT/1973.bmp differ diff --git a/ApplicationResourcePatches/PICT/1974.bmp b/ApplicationResourcePatches/PICT/1974.bmp index 94c10d5..5939a7c 100644 Binary files a/ApplicationResourcePatches/PICT/1974.bmp and b/ApplicationResourcePatches/PICT/1974.bmp differ diff --git a/ApplicationResourcePatches/PICT/1975.bmp b/ApplicationResourcePatches/PICT/1975.bmp index a836c7e..d5309f7 100644 Binary files a/ApplicationResourcePatches/PICT/1975.bmp and b/ApplicationResourcePatches/PICT/1975.bmp differ diff --git a/ApplicationResourcePatches/PICT/1976.bmp b/ApplicationResourcePatches/PICT/1976.bmp index d1527ef..301a28b 100644 Binary files a/ApplicationResourcePatches/PICT/1976.bmp and b/ApplicationResourcePatches/PICT/1976.bmp differ diff --git a/ApplicationResourcePatches/PICT/1977.bmp b/ApplicationResourcePatches/PICT/1977.bmp index 13154a6..7023eb1 100644 Binary files a/ApplicationResourcePatches/PICT/1977.bmp and b/ApplicationResourcePatches/PICT/1977.bmp differ diff --git a/ApplicationResourcePatches/PICT/1978.bmp b/ApplicationResourcePatches/PICT/1978.bmp index 20a8406..1557f9c 100644 Binary files a/ApplicationResourcePatches/PICT/1978.bmp and b/ApplicationResourcePatches/PICT/1978.bmp differ diff --git a/ApplicationResourcePatches/PICT/1979.bmp b/ApplicationResourcePatches/PICT/1979.bmp index d380910..c144a5f 100644 Binary files a/ApplicationResourcePatches/PICT/1979.bmp and b/ApplicationResourcePatches/PICT/1979.bmp differ diff --git a/ApplicationResourcePatches/PICT/1980.bmp b/ApplicationResourcePatches/PICT/1980.bmp index 6e9888e..c46d4a8 100644 Binary files a/ApplicationResourcePatches/PICT/1980.bmp and b/ApplicationResourcePatches/PICT/1980.bmp differ diff --git a/ApplicationResourcePatches/PICT/1981.bmp b/ApplicationResourcePatches/PICT/1981.bmp index b527b67..e43efe8 100644 Binary files a/ApplicationResourcePatches/PICT/1981.bmp and b/ApplicationResourcePatches/PICT/1981.bmp differ diff --git a/ApplicationResourcePatches/PICT/1982.bmp b/ApplicationResourcePatches/PICT/1982.bmp index cc99675..6d4fc17 100644 Binary files a/ApplicationResourcePatches/PICT/1982.bmp and b/ApplicationResourcePatches/PICT/1982.bmp differ diff --git a/ApplicationResourcePatches/PICT/1983.bmp b/ApplicationResourcePatches/PICT/1983.bmp index dc8cb9f..ddb91e7 100644 Binary files a/ApplicationResourcePatches/PICT/1983.bmp and b/ApplicationResourcePatches/PICT/1983.bmp differ diff --git a/ApplicationResourcePatches/PICT/1984.bmp b/ApplicationResourcePatches/PICT/1984.bmp index 524da04..5c9638c 100644 Binary files a/ApplicationResourcePatches/PICT/1984.bmp and b/ApplicationResourcePatches/PICT/1984.bmp differ diff --git a/ApplicationResourcePatches/PICT/1985.bmp b/ApplicationResourcePatches/PICT/1985.bmp index 3b46ba7..a5ad68b 100644 Binary files a/ApplicationResourcePatches/PICT/1985.bmp and b/ApplicationResourcePatches/PICT/1985.bmp differ diff --git a/ApplicationResourcePatches/PICT/1986.bmp b/ApplicationResourcePatches/PICT/1986.bmp index 1d9926e..ce94fc3 100644 Binary files a/ApplicationResourcePatches/PICT/1986.bmp and b/ApplicationResourcePatches/PICT/1986.bmp differ diff --git a/ApplicationResourcePatches/PICT/1987.bmp b/ApplicationResourcePatches/PICT/1987.bmp index cfcd74e..0027e0c 100644 Binary files a/ApplicationResourcePatches/PICT/1987.bmp and b/ApplicationResourcePatches/PICT/1987.bmp differ diff --git a/GpApp/Play.cpp b/GpApp/Play.cpp index e07322d..9dada6c 100644 --- a/GpApp/Play.cpp +++ b/GpApp/Play.cpp @@ -82,7 +82,7 @@ void NewGame (short mode) Rect tempRect; PLError_t theErr; Boolean wasPlayMusicPref; - + gameOver = false; theMode = kPlayMode; if (isPlayMusicGame) @@ -112,7 +112,7 @@ void NewGame (short mode) SetHouseToFirstRoom(); DetermineRoomOpenings(); NilSavedMaps(); - + gameFrame = 0L; numBands = 0; demoIndex = 0; @@ -120,7 +120,7 @@ void NewGame (short mode) otherPlayerEscaped = kNoOneEscaped; onePlayerLeft = false; playerSuicide = false; - + if (twoPlayerGame) // initialize glider(s) { InitGlider(&theGlider, kNewGameMode); @@ -134,7 +134,7 @@ void NewGame (short mode) LoadGraphic(glidSrcMap, kGliderPictID); LoadGraphic(glid2SrcMap, kGliderFoilPictID); } - + #if !BUILD_ARCADE_VERSION // HideMenuBarOld(); // TEMP #endif @@ -146,7 +146,7 @@ void NewGame (short mode) tempRect = thisMac.constrainedScreen; tempRect.top = tempRect.bottom - 20; // thisMac.menuHigh mainWindowSurface->FillRect(tempRect, blackColorMain); - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie)) { @@ -160,9 +160,9 @@ void NewGame (short mode) // DissBitsChunky(&workSrcRect); // else // DissBits(&workSrcRect); - + // DebugStr("\pIf screen isn't black, exit to shell."); // TEMP TEMP TEMP - + ResetLocale(false); RefreshScoreboard(kNormalTitleMode); // if (quickerTransitions) @@ -183,7 +183,7 @@ void NewGame (short mode) { DumpScreenOn(&justRoomsRect, false); } - + InitGarbageRects(); StartGliderFadingIn(&theGlider); if (twoPlayerGame) @@ -194,11 +194,11 @@ void NewGame (short mode) } InitTelephone(); wasPlayMusicPref = isPlayMusicGame; - + #ifdef CREATEDEMODATA SysBeep(1); #endif - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie) && (tvInRoom)) { @@ -210,17 +210,17 @@ void NewGame (short mode) } } #endif - + playing = true; // everything before this line is game set-up PlayGame(); // everything following is after a game has ended - + #ifdef CREATEDEMODATA DumpToResEditFile((Ptr)demoData, sizeof(demoType) * (long)demoIndex); #endif - + isPlayMusicGame = wasPlayMusicPref; ZeroMirrorRegion(); - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie) && (tvInRoom)) { @@ -228,7 +228,7 @@ void NewGame (short mode) theMovie.m_playing = false; } #endif - + twoPlayerGame = false; theMode = kSplashMode; InitCursor(); @@ -253,7 +253,7 @@ void NewGame (short mode) NilSavedMaps(); UpdateMenus(false); - + if (!gameOver) { RedrawSplashScreen(); @@ -269,7 +269,7 @@ void DoDemoGame (void) { short wasHouseIndex; Boolean whoCares; - + wasHouseIndex = thisHouseIndex; whoCares = CloseHouse(); thisHouseIndex = demoHouseIndex; @@ -291,14 +291,14 @@ void DoDemoGame (void) //-------------------------------------------------------------- InitGlider void InitGlider (gliderPtr thisGlider, short mode) -{ +{ WhereDoesGliderBegin(&thisGlider->dest, mode); - + if (mode == kResumeGameMode) numStarsRemaining = smallGame.wasStarsLeft; else if (mode == kNewGameMode) numStarsRemaining = CountStarsInHouse(); - + if (mode == kResumeGameMode) { theScore = smallGame.score; @@ -309,13 +309,13 @@ void InitGlider (gliderPtr thisGlider, short mode) thisGlider->mode = smallGame.gliderState; thisGlider->facing = smallGame.facing; showFoil = smallGame.showFoil; - + switch (thisGlider->mode) { case kGliderBurning: FlagGliderBurning(thisGlider); break; - + default: FlagGliderNormal(thisGlider); break; @@ -336,16 +336,16 @@ void InitGlider (gliderPtr thisGlider, short mode) thisGlider->mask = gliderSrc[0]; showFoil = false; } - + QSetRect(&thisGlider->destShadow, 0, 0, kGliderWide, kShadowHigh); QOffsetRect(&thisGlider->destShadow, thisGlider->dest.left, kShadowTop); thisGlider->wholeShadow = thisGlider->destShadow; - + thisGlider->hVel = 0; thisGlider->vVel = 0; thisGlider->hDesiredVel = 0; thisGlider->vDesiredVel = 0; - + thisGlider->tipped = false; thisGlider->sliding = false; thisGlider->dontDraw = false; @@ -356,7 +356,7 @@ void InitGlider (gliderPtr thisGlider, short mode) void SetHouseToFirstRoom (void) { short firstRoom; - + firstRoom = GetFirstRoomNumber(); ForceThisRoom(firstRoom); } @@ -514,7 +514,7 @@ void HandleInGameEvents(void) //-------------------------------------------------------------- ResetTouchScreenControlBounds -static int16_t touchScreenControlSize = 32; +static int16_t touchScreenControlSize = 64; void ResetTouchScreenControlBounds (void) { @@ -601,14 +601,14 @@ void PlayGame (void) gameFrame++; evenFrame = !evenFrame; - + if (doBackground) { Delay(2, nil); } - + HandleTelephone(); - + if (twoPlayerGame) { HandleDynamics(); @@ -660,7 +660,7 @@ void PlayGame (void) HandleDynamicScoreboard(); } } - + if (gameOver) { countDown--; @@ -668,22 +668,22 @@ void PlayGame (void) { HideGlider(&theGlider); RefreshScoreboard(kNormalTitleMode); - + #if BUILD_ARCADE_VERSION // Need to paint over the scoreboard black. - + boardSrcMap->SetForeColor(StdColors::Black()); boardSrcMap->FillRect(boardSrcRect); - - CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), + + CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), &boardSrcRect, &boardDestRect, srcCopy); - + { Rect bounds; THandle thePicture; SInt16 hOffset; - + if (boardSrcRect.right >= 640) hOffset = (RectWide(&boardSrcRect) - kMaxViewWidth) / 2; else @@ -700,7 +700,7 @@ void PlayGame (void) #else // ShowMenuBarOld(); // TEMP #endif - + if (mortals < 0) DoDiedGameOver(); else @@ -708,21 +708,21 @@ void PlayGame (void) } } } - + #if BUILD_ARCADE_VERSION { DrawSurface *wasCPort = GetGraphicsPort(); - + boardSrcMap->SetForeColor(StdColors::Black()); boardSrcMap->FillRect(boardSrcRect); - - CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), - GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), + + CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), + GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), &boardSrcRect, &boardDestRect, srcCopy); - + SetGraphicsPort(wasCPort); } - + { Rect bounds; THandle thePicture; @@ -741,11 +741,11 @@ void PlayGame (void) boardSrcMap->DrawPicture(thePicture, bounds); thePicture.Dispose(); } - + #else - + // ShowMenuBarOld(); // TEMP - + #endif } @@ -758,11 +758,11 @@ void SetObjectsToDefaults (void) short r, i; char wasState; Boolean initState; - + thisHousePtr = *thisHouse; - + numRooms = thisHousePtr->nRooms; - + for (r = 0; r < numRooms; r++) { thisHousePtr->rooms[r].visited = false; @@ -781,10 +781,10 @@ void SetObjectsToDefaults (void) case kGrecoVent: case kSewerBlower: case kLiftArea: - thisHousePtr->rooms[r].objects[i].data.a.state = + thisHousePtr->rooms[r].objects[i].data.a.state = thisHousePtr->rooms[r].objects[i].data.a.initial; break; - + case kRedClock: case kBlueClock: case kYellowClock: @@ -799,16 +799,16 @@ void SetObjectsToDefaults (void) case kStar: case kSparkle: case kHelium: - thisHousePtr->rooms[r].objects[i].data.c.state = + thisHousePtr->rooms[r].objects[i].data.c.state = thisHousePtr->rooms[r].objects[i].data.c.initial; break; - + case kDeluxeTrans: initState = (thisHousePtr->rooms[r].objects[i].data.d.wide & 0xF0) >> 4; thisHousePtr->rooms[r].objects[i].data.d.wide &= 0xF0; thisHousePtr->rooms[r].objects[i].data.d.wide += initState; break; - + case kCeilingLight: case kLightBulb: case kTableLamp: @@ -817,14 +817,14 @@ void SetObjectsToDefaults (void) case kFlourescent: case kTrackLight: case kInvisLight: - thisHousePtr->rooms[r].objects[i].data.f.state = + thisHousePtr->rooms[r].objects[i].data.f.state = thisHousePtr->rooms[r].objects[i].data.f.initial; break; - + case kStereo: thisHousePtr->rooms[r].objects[i].data.g.state = isPlayMusicGame; break; - + case kShredder: case kToaster: case kMacPlus: @@ -834,10 +834,10 @@ void SetObjectsToDefaults (void) case kOutlet: case kVCR: case kMicrowave: - thisHousePtr->rooms[r].objects[i].data.g.state = + thisHousePtr->rooms[r].objects[i].data.g.state = thisHousePtr->rooms[r].objects[i].data.g.initial; break; - + case kBalloon: case kCopterLf: case kCopterRt: @@ -846,10 +846,10 @@ void SetObjectsToDefaults (void) case kBall: case kDrip: case kFish: - thisHousePtr->rooms[r].objects[i].data.h.state = + thisHousePtr->rooms[r].objects[i].data.h.state = thisHousePtr->rooms[r].objects[i].data.h.initial; break; - + } } } @@ -860,17 +860,17 @@ void SetObjectsToDefaults (void) void HideGlider (gliderPtr thisGlider) { Rect tempRect; - + tempRect = thisGlider->whole; QOffsetRect(&tempRect, playOriginH, playOriginV); CopyRectWorkToMain(&tempRect); - + if (hasMirror) { QOffsetRect(&tempRect, -20, -16); CopyRectWorkToMain(&tempRect); } - + tempRect = thisGlider->wholeShadow; QOffsetRect(&tempRect, playOriginH, playOriginV); CopyRectWorkToMain(&tempRect); @@ -883,7 +883,7 @@ void InitTelephone (void) thePhone.nextRing = RandomInt(kRingSpread) + kRingBaseDelay; thePhone.rings = RandomInt(3) + 3; thePhone.delay = kRingDelay; - + theChimes.nextRing = RandomInt(kChimeDelay) + 1; } @@ -892,7 +892,7 @@ void InitTelephone (void) void HandleTelephone (void) { short delayTime; - + if (!phoneBitSet) { if (thePhone.nextRing == 0) @@ -915,7 +915,7 @@ void HandleTelephone (void) thePhone.nextRing--; } // handle also the wind chimes (if they are present) - + if (numChimes > 0) { if (theChimes.nextRing == 0) @@ -924,11 +924,11 @@ void HandleTelephone (void) PlayPrioritySound(kChime1Sound, kChime1Priority); else PlayPrioritySound(kChime2Sound, kChime2Priority); - + delayTime = kChimeDelay / numChimes; if (delayTime < 2) delayTime = 2; - + theChimes.nextRing = RandomInt(delayTime) + 1; } else @@ -948,19 +948,19 @@ void StrikeChime (void) void RestoreEntireGameScreen (void) { Rect tempRect; - + HideCursor(); - + #if !BUILD_ARCADE_VERSION // HideMenuBarOld(); // TEMP #endif - + DrawSurface *surface = mainWindow->GetDrawSurface(); tempRect = thisMac.constrainedScreen; PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black(); surface->FillRect(tempRect, blackColor); - + ResetLocale(false); RefreshScoreboard(kNormalTitleMode); // if (quickerTransitions)