diff --git a/GpApp/GliderDefines.h b/GpApp/GliderDefines.h index da8c74a..f13d597 100644 --- a/GpApp/GliderDefines.h +++ b/GpApp/GliderDefines.h @@ -510,8 +510,6 @@ #define kNoCeilingLimit -10 #define kNoFloorLimit 332 -#define kScoreboardHigh 0 -#define kScoreboardLow 1 #define kScoreboardTall 20 #define kHouseVersion 0x0200 diff --git a/GpApp/GliderProtos.h b/GpApp/GliderProtos.h index 51b981d..2f7d4ce 100644 --- a/GpApp/GliderProtos.h +++ b/GpApp/GliderProtos.h @@ -432,7 +432,6 @@ void QuickBatteryRefresh (Boolean); void QuickBandsRefresh (Boolean); void QuickFoilRefresh (Boolean); void HandleScore (void); -void AdjustScoreboardHeight (void); //void PutRoomScrap (void); // --- Scrap.c //void PutObjectScrap (void); diff --git a/GpApp/Play.cpp b/GpApp/Play.cpp index 27a41c7..93842fd 100644 --- a/GpApp/Play.cpp +++ b/GpApp/Play.cpp @@ -78,7 +78,6 @@ void NewGame (short mode) PLError_t theErr; Boolean wasPlayMusicPref; - AdjustScoreboardHeight(); gameOver = false; theMode = kPlayMode; if (isPlayMusicGame) diff --git a/GpApp/Scoreboard.cpp b/GpApp/Scoreboard.cpp index a41c9d6..b070741 100644 --- a/GpApp/Scoreboard.cpp +++ b/GpApp/Scoreboard.cpp @@ -42,7 +42,6 @@ Rect badgesBlankRects[4], badgesBadgesRects[4]; Rect badgesDestRects[4]; DrawSurface *boardPSrcMap; long displayedScore; -short wasScoreboardMode; short wasScoreboardTitleMode; Boolean doRollScore; @@ -409,44 +408,3 @@ void QuickFoilRefresh (Boolean flash) MarkScoreboardPortDirty(); } - -//-------------------------------------------------------------- AdjustScoreboardHeight - -void AdjustScoreboardHeight (void) -{ - short offset, newMode; - - if (numNeighbors == 9) - newMode = kScoreboardHigh; - else - newMode = kScoreboardLow; - - if (wasScoreboardMode != newMode) - { - switch (newMode) - { - case kScoreboardHigh: // 9 neighbors - offset = localRoomsDest[kCentralRoom].top; - offset = -offset; - justRoomsRect = workSrcRect; - break; - - case kScoreboardLow: // 1 or 3 neighbors - offset = localRoomsDest[kCentralRoom].top; - justRoomsRect = workSrcRect; - justRoomsRect.top = localRoomsDest[kCentralRoom].top; - justRoomsRect.bottom = localRoomsDest[kCentralRoom].bottom; - break; - } - - QOffsetRect(&boardDestRect, 0, offset); - QOffsetRect(&boardGQDestRect, 0, offset); - QOffsetRect(&boardPQDestRect, 0, offset); - QOffsetRect(&badgesDestRects[kBatteryBadge], 0, offset); - QOffsetRect(&badgesDestRects[kBandsBadge], 0, offset); - QOffsetRect(&badgesDestRects[kFoilBadge], 0, offset); - QOffsetRect(&badgesDestRects[kHeliumBadge], 0, offset); - - wasScoreboardMode = newMode; - } -} diff --git a/GpApp/StructuresInit.cpp b/GpApp/StructuresInit.cpp index 0cadedd..eb21f18 100644 --- a/GpApp/StructuresInit.cpp +++ b/GpApp/StructuresInit.cpp @@ -52,7 +52,6 @@ extern Rect boardPQDestRect, boardGQDestRect, badgesBlankRects[]; extern Rect badgesBadgesRects[], badgesDestRects[]; extern Rect nailSrcRect, sparkleSrc[]; extern Rect pointsSrc[], breadSrc[]; -extern short wasScoreboardMode; //============================================================== Functions @@ -71,7 +70,6 @@ void InitScoreboardMap(void) if (boardSrcMap) DisposeGWorld(boardSrcMap); - wasScoreboardMode = kScoreboardHigh; boardSrcRect = houseRect; ZeroRectCorner(&boardSrcRect); boardSrcRect.bottom = kScoreboardTall;