[Scummvm-git-logs] scummvm master -> 3f09c387475d5ae65aec23499616cf51f6094aad

[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:
3f09c38747 BAGEL: Fix several PVS Studio issues


Commit: 3f09c387475d5ae65aec23499616cf51f6094aad
    https://github.com/scummvm/scummvm/commit/3f09c387475d5ae65aec23499616cf51f6094aad
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-21T23:50:38+01:00

Commit Message:
BAGEL: Fix several PVS Studio issues

Changed paths:
    engines/bagel/baglib/master_win.cpp
    engines/bagel/baglib/movie_object.cpp
    engines/bagel/baglib/storage_dev_win.cpp
    engines/bagel/boflib/dat_file.cpp
    engines/bagel/boflib/dat_file.h


diff --git a/engines/bagel/baglib/master_win.cpp b/engines/bagel/baglib/master_win.cpp
index 80f70942d66..e6eeea8cecb 100644
--- a/engines/bagel/baglib/master_win.cpp
+++ b/engines/bagel/baglib/master_win.cpp
@@ -1194,7 +1194,7 @@ ErrorCode CBagMasterWin::gotoNewWindow(const CBofString *str) {
 		_gameWindow = (CBagStorageDevWnd *)sdev;
 		setCICStatus(sdev);
 
-		int fadeId = sdev->getFadeId();
+		uint16 oldFadeId = sdev->getFadeId();
 
 		if (_fadeIn != 0)
 			sdev->setFadeId((uint16)_fadeIn);
@@ -1204,7 +1204,7 @@ ErrorCode CBagMasterWin::gotoNewWindow(const CBofString *str) {
 
 		sdev->attach();
 
-		sdev->setFadeId((uint16)fadeId);
+		sdev->setFadeId(oldFadeId);
 		_fadeIn = 0;
 	}
 
diff --git a/engines/bagel/baglib/movie_object.cpp b/engines/bagel/baglib/movie_object.cpp
index 9e93faa961d..a40f114885b 100644
--- a/engines/bagel/baglib/movie_object.cpp
+++ b/engines/bagel/baglib/movie_object.cpp
@@ -146,9 +146,8 @@ bool CBagMovieObject::runObject() {
 			CBagStorageDevWnd *pSDevWnd = (pWnd ? pWnd->getCurrentStorageDev() : nullptr);
 
 			// Get the pda here, we need it so much anyway.
-			if (pPDA == nullptr) {
-				pPDA = (CBagPDA *)g_SDevManager->getStorageDevice("BPDA_WLD");
-			}
+			pPDA = (CBagPDA *)g_SDevManager->getStorageDevice("BPDA_WLD");
+
 			assert(pPDA != nullptr);
 
 			// If we have an asnych movie to play, make sure it is a good
@@ -307,7 +306,7 @@ bool CBagMovieObject::runObject() {
 							pMovie = new CBofMovie(CBofApp::getApp()->getMainWindow(), sFileName, &r);
 						}
 
-						if (pMovie && pMovie->errorOccurred() == false) {
+						if (pMovie->errorOccurred() == false) {
 							// Stop any asnych movies already playing
 							pPDA->stopMovie(true);
 							pMovie->show();
diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp
index e38480714ca..7f2b65cc49e 100644
--- a/engines/bagel/baglib/storage_dev_win.cpp
+++ b/engines/bagel/baglib/storage_dev_win.cpp
@@ -635,15 +635,11 @@ ErrorCode CBagStorageDev::loadFileFromStream(CBagIfstream &fpInput, const CBofSt
 
 		if (!sWorkStr.find("SET")) {
 			bRunActivation  = false;
-			bHoldActivation = false;
 			bOperSet        = true;
 		} else if (!sWorkStr.find("HOLD")) {
-			bRunActivation  = true;
 			bHoldActivation = true;
 			bOperSet        = true;
 		} else if (!sWorkStr.find("RUN")) {
-			bRunActivation  = true;
-			bHoldActivation = false;
 			bOperSet        = true;
 		}
 
diff --git a/engines/bagel/boflib/dat_file.cpp b/engines/bagel/boflib/dat_file.cpp
index ab98cf173c9..98ee61c6c95 100644
--- a/engines/bagel/boflib/dat_file.cpp
+++ b/engines/bagel/boflib/dat_file.cpp
@@ -56,7 +56,7 @@ CBofDataFile::CBofDataFile() {
 	_bHeaderDirty = false;
 }
 
-ErrorCode CBofDataFile::setFile(const char *pszFileName, uint32 lFlags, const char *pPassword) {
+ErrorCode CBofDataFile::setFile(const char *pszFileName, uint32 lFlags) {
 	assert(isValidObject(this));
 
 	// Validate input
@@ -69,17 +69,6 @@ ErrorCode CBofDataFile::setFile(const char *pszFileName, uint32 lFlags, const ch
 	// All data files are binary, so force it
 	lFlags |= CBF_BINARY;
 
-	// Store password locally
-	if (pPassword != nullptr) {
-		// Don't want to overwrite past our password buffer
-		assert(strlen(pPassword) < MAX_PW_LEN);
-
-		Common::strcpy_s(_szPassWord, pPassword);
-
-		// Force encryption on since they supplied a password
-		_lFlags |= CDF_ENCRYPT;
-	}
-
 	// Remember the flags
 	_lFlags = lFlags;
 
diff --git a/engines/bagel/boflib/dat_file.h b/engines/bagel/boflib/dat_file.h
index 0492494c350..1af87bb2a70 100644
--- a/engines/bagel/boflib/dat_file.h
+++ b/engines/bagel/boflib/dat_file.h
@@ -105,10 +105,9 @@ public:
 	 * Initializes a CBofDataFile with specified info
 	 * @param pszFileName       Name of .DAT file
 	 * @param lFlags            Flags for open, and encryption, etc.
-	 * @param pPassword         Password for encryption
 	 * @return                  Error return code
 	 */
-	ErrorCode setFile(const char *pszFileName, uint32 lFlags = CDF_DEFAULT, const char *pPassword = nullptr);
+	ErrorCode setFile(const char *pszFileName, uint32 lFlags);
 
 	/**
 	 * Free memory used by this object