[Scummvm-git-logs] scummvm master -> 9327d4a46509bab65b9716bae2eebca13f497f71

[Strangerke]

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:
9327d4a465 BAGEL: Add some missing override keywords, try to fix a problematic cast


Commit: 9327d4a46509bab65b9716bae2eebca13f497f71
    https://github.com/scummvm/scummvm/commit/9327d4a46509bab65b9716bae2eebca13f497f71
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T00:15:06+01:00

Commit Message:
BAGEL: Add some missing override keywords, try to fix a problematic cast

Changed paths:
    engines/bagel/baglib/character_object.cpp
    engines/bagel/spacebar/vid_wnd.h


diff --git a/engines/bagel/baglib/character_object.cpp b/engines/bagel/baglib/character_object.cpp
index 8773800bfc3..c11423a34a7 100644
--- a/engines/bagel/baglib/character_object.cpp
+++ b/engines/bagel/baglib/character_object.cpp
@@ -112,9 +112,10 @@ ErrorCode CBagCharacterObject::attach() {
 		// Forward playback
 		if (_startFrame == -1)
 			_startFrame = 0;
-		if (_endFrame == -1)
-			_endFrame = _smacker->getFrameCount() - 1;
-
+		if (_endFrame == -1) {
+			_endFrame = _smacker->getFrameCount();
+			--_endFrame;
+		}
 	} else {
 		// Reverse playback
 		if (_endFrame == -1)
diff --git a/engines/bagel/spacebar/vid_wnd.h b/engines/bagel/spacebar/vid_wnd.h
index 14565ecf3b0..9ab3d1d0df5 100644
--- a/engines/bagel/spacebar/vid_wnd.h
+++ b/engines/bagel/spacebar/vid_wnd.h
@@ -69,12 +69,12 @@ public:
 	bool hasDisc();
 	int getFrame(double fTime, int nUseDisc);
 
-	virtual ErrorCode  attach();
-	virtual ErrorCode  detach();
+	ErrorCode attach() override;
+	ErrorCode detach() override;
 
-	ErrorCode onRender(CBofBitmap *pBmp, CBofRect *pRect);
+	ErrorCode onRender(CBofBitmap *pBmp, CBofRect *pRect) override;
 
-	CBagObject *onNewButtonObject(const CBofString &sInit);
+	CBagObject *onNewButtonObject(const CBofString &sInit) override;
 };
 
 } // namespace SpaceBar