mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-12-14 12:09:36 +00:00
Remove scoreboard vertical offset (which doesn't work)
This commit is contained in:
@@ -510,8 +510,6 @@
|
|||||||
#define kNoCeilingLimit -10
|
#define kNoCeilingLimit -10
|
||||||
#define kNoFloorLimit 332
|
#define kNoFloorLimit 332
|
||||||
|
|
||||||
#define kScoreboardHigh 0
|
|
||||||
#define kScoreboardLow 1
|
|
||||||
#define kScoreboardTall 20
|
#define kScoreboardTall 20
|
||||||
|
|
||||||
#define kHouseVersion 0x0200
|
#define kHouseVersion 0x0200
|
||||||
|
|||||||
@@ -432,7 +432,6 @@ void QuickBatteryRefresh (Boolean);
|
|||||||
void QuickBandsRefresh (Boolean);
|
void QuickBandsRefresh (Boolean);
|
||||||
void QuickFoilRefresh (Boolean);
|
void QuickFoilRefresh (Boolean);
|
||||||
void HandleScore (void);
|
void HandleScore (void);
|
||||||
void AdjustScoreboardHeight (void);
|
|
||||||
|
|
||||||
//void PutRoomScrap (void); // --- Scrap.c
|
//void PutRoomScrap (void); // --- Scrap.c
|
||||||
//void PutObjectScrap (void);
|
//void PutObjectScrap (void);
|
||||||
|
|||||||
@@ -78,7 +78,6 @@ void NewGame (short mode)
|
|||||||
PLError_t theErr;
|
PLError_t theErr;
|
||||||
Boolean wasPlayMusicPref;
|
Boolean wasPlayMusicPref;
|
||||||
|
|
||||||
AdjustScoreboardHeight();
|
|
||||||
gameOver = false;
|
gameOver = false;
|
||||||
theMode = kPlayMode;
|
theMode = kPlayMode;
|
||||||
if (isPlayMusicGame)
|
if (isPlayMusicGame)
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ Rect badgesBlankRects[4], badgesBadgesRects[4];
|
|||||||
Rect badgesDestRects[4];
|
Rect badgesDestRects[4];
|
||||||
DrawSurface *boardPSrcMap;
|
DrawSurface *boardPSrcMap;
|
||||||
long displayedScore;
|
long displayedScore;
|
||||||
short wasScoreboardMode;
|
|
||||||
short wasScoreboardTitleMode;
|
short wasScoreboardTitleMode;
|
||||||
Boolean doRollScore;
|
Boolean doRollScore;
|
||||||
|
|
||||||
@@ -409,44 +408,3 @@ void QuickFoilRefresh (Boolean flash)
|
|||||||
|
|
||||||
MarkScoreboardPortDirty();
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ extern Rect boardPQDestRect, boardGQDestRect, badgesBlankRects[];
|
|||||||
extern Rect badgesBadgesRects[], badgesDestRects[];
|
extern Rect badgesBadgesRects[], badgesDestRects[];
|
||||||
extern Rect nailSrcRect, sparkleSrc[];
|
extern Rect nailSrcRect, sparkleSrc[];
|
||||||
extern Rect pointsSrc[], breadSrc[];
|
extern Rect pointsSrc[], breadSrc[];
|
||||||
extern short wasScoreboardMode;
|
|
||||||
|
|
||||||
|
|
||||||
//============================================================== Functions
|
//============================================================== Functions
|
||||||
@@ -71,7 +70,6 @@ void InitScoreboardMap(void)
|
|||||||
if (boardSrcMap)
|
if (boardSrcMap)
|
||||||
DisposeGWorld(boardSrcMap);
|
DisposeGWorld(boardSrcMap);
|
||||||
|
|
||||||
wasScoreboardMode = kScoreboardHigh;
|
|
||||||
boardSrcRect = houseRect;
|
boardSrcRect = houseRect;
|
||||||
ZeroRectCorner(&boardSrcRect);
|
ZeroRectCorner(&boardSrcRect);
|
||||||
boardSrcRect.bottom = kScoreboardTall;
|
boardSrcRect.bottom = kScoreboardTall;
|
||||||
|
|||||||
Reference in New Issue
Block a user