WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-24 15:16:38 +00:00
Code Issues Projects Releases Wiki Activity

Nudge scoreboard rects to positive coordinates (pending move to a different window)

Browse Source
This commit is contained in:
elasota
2019-12-26 19:41:24 -05:00
parent 97570693da
commit 87d112d187
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
GpApp/Scoreboard.cpp
View File

@@ -49,6 +49,13 @@ extern Boolean evenFrame, onePlayerLeft;
//============================================================== Functions //============================================================== Functions
//-------------------------------------------------------------- MarkScoreboardPortDirty
void MarkScoreboardPortDirty(void)
{
GetWindowPort(mainWindow)->m_port.SetDirty(PortabilityLayer::QDPortDirtyFlag_Contents);
}
//-------------------------------------------------------------- RefreshScoreboard //-------------------------------------------------------------- RefreshScoreboard
void RefreshScoreboard (short mode) void RefreshScoreboard (short mode)
@@ -62,6 +69,8 @@ void RefreshScoreboard (short mode)
CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap),
GetPortBitMapForCopyBits(GetWindowPort(mainWindow)), GetPortBitMapForCopyBits(GetWindowPort(mainWindow)),
&boardSrcRect, &boardDestRect, srcCopy, 0L); &boardSrcRect, &boardDestRect, srcCopy, 0L);
MarkScoreboardPortDirty();
QuickBatteryRefresh(false); QuickBatteryRefresh(false);
QuickBandsRefresh(false); QuickBandsRefresh(false);
@@ -186,6 +195,8 @@ void RefreshRoomTitle (short mode)
CopyBits((BitMap *)*GetGWorldPixMap(boardTSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(boardTSrcMap),
(BitMap *)*GetGWorldPixMap(boardSrcMap), (BitMap *)*GetGWorldPixMap(boardSrcMap),
&boardTSrcRect, &boardTDestRect, srcCopy, nil); &boardTSrcRect, &boardTDestRect, srcCopy, nil);
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- RefreshNumGliders //-------------------------------------------------------------- RefreshNumGliders
@@ -225,6 +236,8 @@ void RefreshNumGliders (void)
CopyBits((BitMap *)*GetGWorldPixMap(boardGSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(boardGSrcMap),
(BitMap *)*GetGWorldPixMap(boardSrcMap), (BitMap *)*GetGWorldPixMap(boardSrcMap),
&boardGSrcRect, &boardGDestRect, srcCopy, nil); &boardGSrcRect, &boardGDestRect, srcCopy, nil);
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- RefreshPoints //-------------------------------------------------------------- RefreshPoints
@@ -262,6 +275,8 @@ void RefreshPoints (void)
&boardPSrcRect, &boardPDestRect, srcCopy, nil); &boardPSrcRect, &boardPDestRect, srcCopy, nil);
displayedScore = theScore; displayedScore = theScore;
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- QuickGlidersRefresh //-------------------------------------------------------------- QuickGlidersRefresh
@@ -297,6 +312,8 @@ void QuickGlidersRefresh (void)
CopyBits((BitMap *)*GetGWorldPixMap(boardGSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(boardGSrcMap),
GetPortBitMapForCopyBits(GetWindowPort(mainWindow)), GetPortBitMapForCopyBits(GetWindowPort(mainWindow)),
&boardGSrcRect, &boardGQDestRect, srcCopy, nil); &boardGSrcRect, &boardGQDestRect, srcCopy, nil);
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- QuickScoreRefresh //-------------------------------------------------------------- QuickScoreRefresh
@@ -332,6 +349,8 @@ void QuickScoreRefresh (void)
CopyBits((BitMap *)*GetGWorldPixMap(boardPSrcMap), CopyBits((BitMap *)*GetGWorldPixMap(boardPSrcMap),
GetPortBitMapForCopyBits(GetWindowPort(mainWindow)), GetPortBitMapForCopyBits(GetWindowPort(mainWindow)),
&boardPSrcRect, &boardPQDestRect, srcCopy, nil); &boardPSrcRect, &boardPQDestRect, srcCopy, nil);
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- QuickBatteryRefresh //-------------------------------------------------------------- QuickBatteryRefresh
@@ -362,6 +381,8 @@ void QuickBatteryRefresh (Boolean flash)
&badgesDestRects[kBatteryBadge], &badgesDestRects[kBatteryBadge],
srcCopy, nil); srcCopy, nil);
} }
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- QuickBandsRefresh //-------------------------------------------------------------- QuickBandsRefresh
@@ -384,6 +405,8 @@ void QuickBandsRefresh (Boolean flash)
&badgesDestRects[kBandsBadge], &badgesDestRects[kBandsBadge],
srcCopy, nil); srcCopy, nil);
} }
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- QuickFoilRefresh //-------------------------------------------------------------- QuickFoilRefresh
@@ -406,6 +429,8 @@ void QuickFoilRefresh (Boolean flash)
&badgesDestRects[kFoilBadge], &badgesDestRects[kFoilBadge],
srcCopy, nil); srcCopy, nil);
} }
MarkScoreboardPortDirty();
} }
//-------------------------------------------------------------- AdjustScoreboardHeight //-------------------------------------------------------------- AdjustScoreboardHeight

11
GpApp/StructuresInit.cpp
View File

@@ -93,7 +93,6 @@ void InitScoreboardMap (void)
LoadGraphic(kBadgePictID); LoadGraphic(kBadgePictID);
boardDestRect = boardSrcRect; boardDestRect = boardSrcRect;
QOffsetRect(&boardDestRect, 0, -kScoreboardTall);
hOffset = (RectWide(&houseRect) - 640) / 2; hOffset = (RectWide(&houseRect) - 640) / 2;
if (hOffset < 0) if (hOffset < 0)
@@ -123,9 +122,7 @@ void InitScoreboardMap (void)
boardPDestRect = boardPSrcRect; boardPDestRect = boardPSrcRect;
QOffsetRect(&boardPDestRect, 570 + hOffset, 5); // total = 6396 pixels QOffsetRect(&boardPDestRect, 570 + hOffset, 5); // total = 6396 pixels
boardPQDestRect = boardPDestRect; boardPQDestRect = boardPDestRect;
QOffsetRect(&boardPQDestRect, 0, -kScoreboardTall);
boardGQDestRect = boardGDestRect; boardGQDestRect = boardGDestRect;
QOffsetRect(&boardGQDestRect, 0, -kScoreboardTall);
TextFont(applFont); TextFont(applFont);
TextSize(12); TextSize(12);
TextFace(bold); TextFace(bold);
@@ -149,13 +146,13 @@ void InitScoreboardMap (void)
QOffsetRect(&badgesBadgesRects[3], 16, 49); QOffsetRect(&badgesBadgesRects[3], 16, 49);
QSetRect(&badgesDestRects[0], 0, 0, 16, 16); // foil QSetRect(&badgesDestRects[0], 0, 0, 16, 16); // foil
QOffsetRect(&badgesDestRects[0], 432 + hOffset, 2 - kScoreboardTall); QOffsetRect(&badgesDestRects[0], 432 + hOffset, 2);
QSetRect(&badgesDestRects[1], 0, 0, 16, 16); // rubber bands QSetRect(&badgesDestRects[1], 0, 0, 16, 16); // rubber bands
QOffsetRect(&badgesDestRects[1], 449 + hOffset, 2 - kScoreboardTall); QOffsetRect(&badgesDestRects[1], 449 + hOffset, 2);
QSetRect(&badgesDestRects[2], 0, 0, 16, 17); // battery QSetRect(&badgesDestRects[2], 0, 0, 16, 17); // battery
QOffsetRect(&badgesDestRects[2], 467 + hOffset, 1 - kScoreboardTall); QOffsetRect(&badgesDestRects[2], 467 + hOffset, 1);
QSetRect(&badgesDestRects[3], 0, 0, 16, 17); // helium QSetRect(&badgesDestRects[3], 0, 0, 16, 17); // helium
QOffsetRect(&badgesDestRects[3], 467 + hOffset, 1 - kScoreboardTall); QOffsetRect(&badgesDestRects[3], 467 + hOffset, 1);
SetGWorld(wasCPort, wasWorld); SetGWorld(wasCPort, wasWorld);
} }