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

[Strangerke]

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

Summary:
1b722f9ac0 BAGEL: Remove setHotspot(const CBofPoint point) in CBagCursor
ef80e42f33 BAGEL: remove _reversedFl in CBagFMovie


Commit: 1b722f9ac08859837b359aef044c6356a8e25c0d
    https://github.com/scummvm/scummvm/commit/1b722f9ac08859837b359aef044c6356a8e25c0d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-12T22:03:04+01:00

Commit Message:
BAGEL: Remove setHotspot(const CBofPoint point) in CBagCursor

Changed paths:
    engines/bagel/baglib/cursor.cpp
    engines/bagel/baglib/cursor.h


diff --git a/engines/bagel/baglib/cursor.cpp b/engines/bagel/baglib/cursor.cpp
index 94adb4bb5a9..e929d3ebf85 100644
--- a/engines/bagel/baglib/cursor.cpp
+++ b/engines/bagel/baglib/cursor.cpp
@@ -108,6 +108,15 @@ CBagCursor::~CBagCursor() {
 	unLoad();
 }
 
+void CBagCursor::setHotspot(int x, int y) {
+	_x = x;
+	_y = y;
+}
+
+CBofPoint CBagCursor::getHotspot() const {
+	return CBofPoint(_x, _y);
+}
+
 ErrorCode CBagCursor::load(CBofBitmap *bmp) {
 	assert(isValidObject(this));
 	assert(bmp != nullptr);
diff --git a/engines/bagel/baglib/cursor.h b/engines/bagel/baglib/cursor.h
index f478d557876..c1e2cbfc9c1 100644
--- a/engines/bagel/baglib/cursor.h
+++ b/engines/bagel/baglib/cursor.h
@@ -57,16 +57,9 @@ public:
 
 	~CBagCursor();
 
-	void setHotspot(int x, int y) {
-		_x = x;
-		_y = y;
-	}
-	void setHotspot(const CBofPoint point) {
-		setHotspot(point.x, point.y);
-	}
-	CBofPoint getHotspot() const {
-		return CBofPoint(_x, _y);
-	}
+	void setHotspot(int x, int y);
+
+	CBofPoint getHotspot() const;
 
 	int getX() const {
 		return _x;


Commit: ef80e42f33a86950830c37f683ad8ff8b265da4d
    https://github.com/scummvm/scummvm/commit/ef80e42f33a86950830c37f683ad8ff8b265da4d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-12T22:03:05+01:00

Commit Message:
BAGEL: remove _reversedFl in CBagFMovie

Changed paths:
    engines/bagel/baglib/fmovie.cpp
    engines/bagel/baglib/fmovie.h


diff --git a/engines/bagel/baglib/fmovie.cpp b/engines/bagel/baglib/fmovie.cpp
index fdfef1f4462..6aa47d3716d 100644
--- a/engines/bagel/baglib/fmovie.cpp
+++ b/engines/bagel/baglib/fmovie.cpp
@@ -125,8 +125,7 @@ bool CBagFMovie::openMovie(const char *sFilename) {
 		_bmpBuf->lock();
 		_bmpBuf->fillRect(nullptr, _smackerPal->getNearestIndex(CTEXT_WHITE));
 
-		_reversedFl = !(_bmpBuf->isTopDown());
-		_bufferStart = (char *)_bmpBuf->getPixelAddress(0, _reversedFl * (_bmpBuf->height() - 1));
+		_bufferStart = (char *)_bmpBuf->getPixelAddress(0, _bmpBuf->isTopDown() ? 0 : (_bmpBuf->height() - 1));
 		_bufferLength = ABS(_bmpBuf->height() * _bmpBuf->width());
 
 		const Graphics::Surface *frame = _smk->decodeNextFrame();
diff --git a/engines/bagel/baglib/fmovie.h b/engines/bagel/baglib/fmovie.h
index 4ec4c6e6aa6..78a4081d51f 100644
--- a/engines/bagel/baglib/fmovie.h
+++ b/engines/bagel/baglib/fmovie.h
@@ -47,7 +47,6 @@ protected:
 	CBofPalette *_smackerPal;
 	char *_bufferStart;
 	int _bufferLength;
-	uint32 _reversedFl;
 	CBofRect _bounds;
 	bool _useNewPaletteFl;
 	bool _blackOutWindowFl;