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

bluegr noreply at scummvm.org
Fri Jul 26 21:51:50 UTC 2024


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:
d3f070363c JANITORIAL: BAGEL: Fix in-code typos


Commit: d3f070363c04b3246c968c9e32ed7d76b060f492
    https://github.com/scummvm/scummvm/commit/d3f070363c04b3246c968c9e32ed7d76b060f492
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-27T00:51:48+03:00

Commit Message:
JANITORIAL: BAGEL: Fix in-code typos

Changed paths:
    engines/bagel/baglib/exam.cpp
    engines/bagel/baglib/fmovie.cpp
    engines/bagel/baglib/fmovie.h
    engines/bagel/boflib/gui/movie.cpp
    engines/bagel/boflib/gui/movie.h


diff --git a/engines/bagel/baglib/exam.cpp b/engines/bagel/baglib/exam.cpp
index 841ec5b2d5f..6f1ea95228a 100644
--- a/engines/bagel/baglib/exam.cpp
+++ b/engines/bagel/baglib/exam.cpp
@@ -95,7 +95,7 @@ void  CBagExam::onButtonUp(uint32 /*n flags, unused */, CBofPoint * /* point, un
 
 
 bool CBagExam::rotateLeft() {
-	if (_eMovStatus != FOREWARD)
+	if (_eMovStatus != FORWARD)
 		return play();
 
 	return true;
@@ -109,7 +109,7 @@ bool CBagExam::rotateRight() {
 }
 
 bool CBagExam::rotateStop() {
-	if (_eMovStatus == FOREWARD || _eMovStatus == REVERSE)
+	if (_eMovStatus == FORWARD || _eMovStatus == REVERSE)
 		// The movie is currently playing
 		return pause();
 
@@ -128,7 +128,7 @@ void CBagExam::onMouseMove(uint32 /* flags, unused */, CBofPoint *point, void *
 	} else if (point->x >= _rightRect.left) {
 		// Right rect, play forward
 		rotateRight();
-	} else if (_eMovStatus == FOREWARD || _eMovStatus == REVERSE) {
+	} else if (_eMovStatus == FORWARD || _eMovStatus == REVERSE) {
 		rotateStop();
 	}
 }
diff --git a/engines/bagel/baglib/fmovie.cpp b/engines/bagel/baglib/fmovie.cpp
index 2875a7e0c3e..c0f0414561a 100644
--- a/engines/bagel/baglib/fmovie.cpp
+++ b/engines/bagel/baglib/fmovie.cpp
@@ -194,7 +194,7 @@ void CBagFMovie::onMainLoop() {
 	// Paint the buffer to the screen.
 	_filterBmp->paint(this, 0, 0);
 
-	if (_movieStatus == MOVIE_FOREWARD) {
+	if (_movieStatus == MOVIE_FORWARD) {
 		if (_smk->getCurFrame() == (int)_smk->getFrameCount() - 1) {
 			if (_loopFl == false) {
 				onMovieDone();
@@ -286,7 +286,7 @@ bool CBagFMovie::play() {
 	_smk->pauseVideo(false);
 	// _smk->setReverse(false); // TODO: Not supported by SMK
 	_smk->start();
-	_movieStatus = MOVIE_FOREWARD;
+	_movieStatus = MOVIE_FORWARD;
 	return true;
 }
 
diff --git a/engines/bagel/baglib/fmovie.h b/engines/bagel/baglib/fmovie.h
index 78a4081d51f..0ebed292bc0 100644
--- a/engines/bagel/baglib/fmovie.h
+++ b/engines/bagel/baglib/fmovie.h
@@ -33,7 +33,7 @@ namespace Bagel {
 
 class CBagFMovie : public CBofDialog {
 public:
-	enum MovieStatus { MOVIE_STOPPED, MOVIE_PAUSED, MOVIE_FOREWARD, MOVIE_REVERSE };
+	enum MovieStatus { MOVIE_STOPPED, MOVIE_PAUSED, MOVIE_FORWARD, MOVIE_REVERSE };
 
 protected:
 	Video::SmackerDecoder *_smk;
diff --git a/engines/bagel/boflib/gui/movie.cpp b/engines/bagel/boflib/gui/movie.cpp
index 6e85de47c79..4a3d03d1482 100644
--- a/engines/bagel/boflib/gui/movie.cpp
+++ b/engines/bagel/boflib/gui/movie.cpp
@@ -158,7 +158,7 @@ void  CBofMovie::onMainLoop() {
 		updateWindow();
 	}
 
-	if (_eMovStatus == FOREWARD) {
+	if (_eMovStatus == FORWARD) {
 		if (_pSmk->getCurFrame() == (int)_pSmk->getFrameCount() - 1) {
 			if (_bLoop == false) {
 				onMovieDone();
@@ -234,7 +234,7 @@ bool CBofMovie::play() {
 		_pSmk->pauseVideo(false);
 		//_pSmk->setReverse(false); // TODO: Not supported by SMK
 		_pSmk->start();
-		_eMovStatus = FOREWARD;
+		_eMovStatus = FORWARD;
 		return true;
 	}
 
diff --git a/engines/bagel/boflib/gui/movie.h b/engines/bagel/boflib/gui/movie.h
index ca6230d26aa..80006af843c 100644
--- a/engines/bagel/boflib/gui/movie.h
+++ b/engines/bagel/boflib/gui/movie.h
@@ -33,7 +33,7 @@ namespace Bagel {
 
 class CBofMovie : public CBofDialog {
 public:
-	enum MVSTATUS { STOPPED, PAUSED, FOREWARD, REVERSE};
+	enum MVSTATUS { STOPPED, PAUSED, FORWARD, REVERSE};
 protected:
 	Graphics::ManagedSurface *_pSbuf;
 	Video::SmackerDecoder *_pSmk;




More information about the Scummvm-git-logs mailing list