[Scummvm-git-logs] scummvm master -> 93547c96334f2a4759ff008129c369adac574216

[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:
93547c9633 BAGEL: remove unused _bContainsModel in storage_dev_win


Commit: 93547c96334f2a4759ff008129c369adac574216
    https://github.com/scummvm/scummvm/commit/93547c96334f2a4759ff008129c369adac574216
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-10T08:42:36+01:00

Commit Message:
BAGEL: remove unused _bContainsModel in storage_dev_win

Changed paths:
    engines/bagel/baglib/rp_object.cpp
    engines/bagel/baglib/storage_dev_win.cpp
    engines/bagel/baglib/storage_dev_win.h


diff --git a/engines/bagel/baglib/rp_object.cpp b/engines/bagel/baglib/rp_object.cpp
index 74aff1d8ed5..06a54eef7ba 100644
--- a/engines/bagel/baglib/rp_object.cpp
+++ b/engines/bagel/baglib/rp_object.cpp
@@ -1380,7 +1380,7 @@ void CBagRPObject::showResiduePrintedReview() {
 	}
 
 	if (!pLogWld) {
-		warning("Unexpected null logWld in showResiduePrintedReview");
+		warning("showResiduePrintedReview() - Unexpected null logWld");
 		return;
 	}
 	
diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp
index f4a9ee77fed..d178d21fcfe 100644
--- a/engines/bagel/baglib/storage_dev_win.cpp
+++ b/engines/bagel/baglib/storage_dev_win.cpp
@@ -314,8 +314,6 @@ ErrorCode CBagStorageDev::attachActiveObjects() {
 
 	int nCount = getObjectCount();
 	if (nCount != 0) {
-		setContainsModal(false);
-
 		for (int i = 0; i < nCount; ++i) {
 			if (g_engine->shouldQuit())
 				return ERR_NONE;
@@ -340,8 +338,7 @@ ErrorCode CBagStorageDev::attachActiveObjects() {
 							}
 						}
 					}
-					if (pObj->isModal())
-						setContainsModal(true);
+
 					if (pObj->isFloating()) {
 						nArrangePos = arrangeFloater(nArrangePos, pObj);
 					}
diff --git a/engines/bagel/baglib/storage_dev_win.h b/engines/bagel/baglib/storage_dev_win.h
index ae192306807..ed2185c2ec5 100644
--- a/engines/bagel/baglib/storage_dev_win.h
+++ b/engines/bagel/baglib/storage_dev_win.h
@@ -113,7 +113,6 @@ protected:
 
 	bool _bForeignList : true;   // True if setObjectList has been called
 	bool _bCloseOnOpen : true;   // True if other SDev should be closed when this is opened
-	bool _bContainsModal : true; // True if SDev contains a modal object
 	bool _bCloseup : true;       // true if is a closeup (includes CIC, or CHAT)
 	bool _bCIC : true;           // true if is a CIC
 	bool _bCustom : true;        // true if is a hand coded closeup
@@ -253,13 +252,6 @@ public:
 		_bCloseOnOpen = bVal;
 	}
 
-	bool getContainsModal() {
-		return _bContainsModal;
-	}
-	void setContainsModal(bool bVal) {
-		_bContainsModal = bVal;
-	}
-
 	uint16 getExitOnEdge() {
 		return _nExitOnEdge;
 	}