[Scummvm-git-logs] scummvm master -> d692a2c250731f38607c8a91940baa9de8420b2e

SupSuper noreply at scummvm.org
Mon Jan 6 07:29:54 UTC 2025


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d692a2c250 BAGEL: Fix slot machine path initialization (bug #15581)


Commit: d692a2c250731f38607c8a91940baa9de8420b2e
    https://github.com/scummvm/scummvm/commit/d692a2c250731f38607c8a91940baa9de8420b2e
Author: SupSuper (supsuper at gmail.com)
Date: 2025-01-06T07:29:43Z

Commit Message:
BAGEL: Fix slot machine path initialization (bug #15581)

Changed paths:
    engines/bagel/boflib/gfx/bitmap.cpp
    engines/bagel/spacebar/slot_wnd.cpp


diff --git a/engines/bagel/boflib/gfx/bitmap.cpp b/engines/bagel/boflib/gfx/bitmap.cpp
index fb0d76a218d..56602828e10 100644
--- a/engines/bagel/boflib/gfx/bitmap.cpp
+++ b/engines/bagel/boflib/gfx/bitmap.cpp
@@ -174,7 +174,7 @@ ErrorCode CBofBitmap::loadBitmap(const char *pszFileName, CBofPalette *pPalette)
 		Image::BitmapDecoder decoder;
 		Common::SeekableReadStream *rs = *pFile;
 		if (!rs || !decoder.loadStream(*rs))
-			error("Could not load bitmap");
+			error("Could not load bitmap %s", pszFileName);
 
 		// Load up the decoded bitmap
 		_bitmap.copyFrom(*decoder.getSurface());
diff --git a/engines/bagel/spacebar/slot_wnd.cpp b/engines/bagel/spacebar/slot_wnd.cpp
index 71ca602bbc5..9d4fe84e088 100644
--- a/engines/bagel/spacebar/slot_wnd.cpp
+++ b/engines/bagel/spacebar/slot_wnd.cpp
@@ -268,13 +268,13 @@ ErrorCode  SBarSlotWnd::attach() {
 	_pBkgSnd = new CBofSound(this, BuildSlotDir(CASINO_AUDIO), SOUND_MIX, 99999);
 	_pBkgSnd->play();
 
-	CBofCursor::show();
+	CBagCursor::showSystemCursor();
 
 	return _errCode;
 }
 
 ErrorCode SBarSlotWnd::detach() {
-	CBofCursor::hide();
+	CBagCursor::hideSystemCursor();
 
 	// Put any credits left in machine back into you credit chip.
 	if (_nBet > 0) {
@@ -854,7 +854,7 @@ const char *BuildSlotDir(const char *pszFile) {
 	static char szBuf[MAX_DIRPATH];
 
 	// Where Slot assets
-	Common::sprintf_s(szBuf, "%s%s%s", BGCB_DIR, PATH_DELIMETER, pszFile);
+	Common::sprintf_s(szBuf, "%s%s", BGCB_DIR, pszFile);
 
 	CBofString sSlotDir(szBuf, MAX_DIRPATH);
 	fixPathName(sSlotDir);




More information about the Scummvm-git-logs mailing list