[Scummvm-git-logs] scummvm master -> 25da373e084cd555a7ec88a047eb6909a69861a4
dreammaster
noreply at scummvm.org
Thu Nov 27 06:15:11 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
25da373e08 BAGEL: METAGAME: Fix crash entering pawn shop
Commit: 25da373e084cd555a7ec88a047eb6909a69861a4
https://github.com/scummvm/scummvm/commit/25da373e084cd555a7ec88a047eb6909a69861a4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-11-26T22:14:58-08:00
Commit Message:
BAGEL: METAGAME: Fix crash entering pawn shop
Changed paths:
engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
index 64f4bffe86a..a03aa28f9b6 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
@@ -40,7 +40,7 @@ namespace Gtl {
#define MORE_TEXT_LENGTH 8 // # characters in "more" indicator string
#define BUTTON_DY 15 // offset for Okay button from pawn base
-
+#define FONT_SIZE 14
extern CBfcMgr *lpMetaGameStruct;
@@ -541,7 +541,7 @@ void CPawnShop::UpdateCrowns(CDC *pDC) {
else
Common::sprintf_s(chBuffer, "Podj has %ld Crowns", (*pItem).GetQuantity());
}
- (*pItemCost).DisplayString(pDC, chBuffer, 18, TEXT_BOLD, PAWN_TEXT_COLOR);
+ (*pItemCost).DisplayString(pDC, chBuffer, FONT_SIZE, TEXT_BOLD, PAWN_TEXT_COLOR);
}
@@ -728,8 +728,8 @@ void CPawnShop::OnMouseMove(unsigned int nFlags, CPoint point) {
Common::sprintf_s(chBuffer, "One can be sold for %d Crowns", nPrice);
hNewCursor = (*pMyApp).LoadCursor(IDC_PAWN_DOLLAR);
}
- (*pItemText).DisplayString(pDC, (*pItem).GetDescription(), 18, TEXT_BOLD, PAWN_TEXT_COLOR);
- (*pItemCost).DisplayString(pDC, chBuffer, 18, TEXT_BOLD, PAWN_TEXT_COLOR);
+ (*pItemText).DisplayString(pDC, (*pItem).GetDescription(), FONT_SIZE, TEXT_BOLD, PAWN_TEXT_COLOR);
+ (*pItemCost).DisplayString(pDC, chBuffer, FONT_SIZE, TEXT_BOLD, PAWN_TEXT_COLOR);
ReleaseDC(pDC);
}
}
@@ -738,7 +738,7 @@ void CPawnShop::OnMouseMove(unsigned int nFlags, CPoint point) {
if (hNewCursor == nullptr) { // use default cursor if not specified
hNewCursor = (*pMyApp).LoadStandardCursor(IDC_ARROW);
pDC = GetDC();
- (*pItemText).DisplayString(pDC, "", 18, TEXT_BOLD, PAWN_TEXT_COLOR);
+ (*pItemText).DisplayString(pDC, "", FONT_SIZE, TEXT_BOLD, PAWN_TEXT_COLOR);
UpdateCrowns(pDC);
ReleaseDC(pDC);
}
@@ -790,7 +790,7 @@ void CPawnShop::OnLButtonDown(unsigned int nFlags, CPoint point) {
(*pInventory).RemoveItem(pItem);
(*pGeneralStore).AddItem(pItem);
}
- (*pItemText).DisplayString(pDC, "Thank you!!!", 18, TEXT_BOLD, PAWN_BLURB_COLOR);
+ (*pItemText).DisplayString(pDC, "Thank you!!!", FONT_SIZE, TEXT_BOLD, PAWN_BLURB_COLOR);
(*pItemCost).RestoreBackground(pDC);
ReleaseDC(pDC);
bNeedsUpdate = true;
More information about the Scummvm-git-logs
mailing list