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

Strangerke noreply at scummvm.org
Fri May 10 21:05:05 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:
cc25528df4 BAGEL: Remove a remaining ifndef


Commit: cc25528df40fc954aab84382a02870c9b07c3f31
    https://github.com/scummvm/scummvm/commit/cc25528df40fc954aab84382a02870c9b07c3f31
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-10T22:04:56+01:00

Commit Message:
BAGEL: Remove a remaining ifndef

Changed paths:
    engines/bagel/baglib/movie_object.cpp


diff --git a/engines/bagel/baglib/movie_object.cpp b/engines/bagel/baglib/movie_object.cpp
index 5f500b494bb..924f846e142 100644
--- a/engines/bagel/baglib/movie_object.cpp
+++ b/engines/bagel/baglib/movie_object.cpp
@@ -92,7 +92,6 @@ bool CBagMovieObject::runObject() {
 			return rc;
 		}
 
-#ifndef BOF_FINAL_RELEASE
 		//
 		// This would be much cooler if it were a cast to another object type and
 		// then a run.  But this is a quicker fix.
@@ -142,8 +141,6 @@ bool CBagMovieObject::runObject() {
 		}
 
 		if (nMovFileType == MovieFileType::MOVIE) {
-#endif
-
 			bool isFiltered = false;
 			CBagMasterWin *pWnd = CBagel::getBagApp()->getMasterWnd();
 			CBagStorageDevWnd *pSDevWnd = (pWnd ? pWnd->getCurrentStorageDev() : nullptr);




More information about the Scummvm-git-logs mailing list