[Scummvm-git-logs] scummvm master -> 72248faef947e88b0a7534fcc032c010b125d636

[sev-]

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:
72248faef9 Revert "BAGEL: Remove null checks before delete, remove useless assignment"


Commit: 72248faef947e88b0a7534fcc032c010b125d636
    https://github.com/scummvm/scummvm/commit/72248faef947e88b0a7534fcc032c010b125d636
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-30T00:39:24+02:00

Commit Message:
Revert "BAGEL: Remove null checks before delete, remove useless assignment"

This reverts commit 2782a6eabc2fd7280e790a3f7a2480483aaff96b.

It uses non-portable function calls

Changed paths:
    engines/bagel/baglib/master_win.cpp
    engines/bagel/baglib/moo.cpp
    engines/bagel/baglib/movie_object.cpp
    engines/bagel/baglib/paint_table.cpp
    engines/bagel/baglib/pan_window.cpp
    engines/bagel/baglib/parse_object.cpp


diff --git a/engines/bagel/baglib/master_win.cpp b/engines/bagel/baglib/master_win.cpp
index 81d2169cb3e..8e93e3d0299 100644
--- a/engines/bagel/baglib/master_win.cpp
+++ b/engines/bagel/baglib/master_win.cpp
@@ -936,7 +936,7 @@ ErrorCode CBagMasterWin::setStorageDev(const CBofString &wldName, bool entry) {
 		assert(g_string >= 0 && g_string < NUM_MSG_STRINGS);
 		assert(wldName.getLength() < 512);
 
-		strncpy_s(g_stringArray[g_string], wldName, 511);
+		strncpy(g_stringArray[g_string], wldName, 511);
 
 		postUserMessage(WM_ENTER_NEW_WLD, (uint32)g_string);
 
@@ -1443,7 +1443,7 @@ void CBagMasterWin::fillSaveBuffer(StBagelSave *saveBuf) {
 			}
 
 			// Remember current script file
-			strncpy_s(saveBuf->_szScript, getWldScript().getBuffer(), MAX_FNAME - 1);
+			strncpy(saveBuf->_szScript, getWldScript().getBuffer(), MAX_FNAME - 1);
 
 			CBagStorageDevWnd *sdevWin = getCurrentStorageDev();
 			if (sdevWin != nullptr) {
diff --git a/engines/bagel/baglib/moo.cpp b/engines/bagel/baglib/moo.cpp
index de0b89d277d..d822c2dcea7 100644
--- a/engines/bagel/baglib/moo.cpp
+++ b/engines/bagel/baglib/moo.cpp
@@ -59,9 +59,13 @@ CBagMoo::~CBagMoo() {
 }
 
 ErrorCode CBagMoo::setPDAMovie(CBofString &s) {
+	ErrorCode errorCode = ERR_NONE;
+
 	// Should never happen, but just make sure.
-	delete _pMovie;
-	_pMovie = nullptr;
+	if (_pMovie) {
+		delete _pMovie;
+		_pMovie = nullptr;
+	}
 
 	// Get a new movie object
 	_pMovie = new CBagCharacterObject();
@@ -69,7 +73,7 @@ ErrorCode CBagMoo::setPDAMovie(CBofString &s) {
 	_pMovie->setFileName(s);
 
 	// Attach this bad baby...
-	ErrorCode errorCode = _pMovie->attach();
+	errorCode = _pMovie->attach();
 	if (errorCode == ERR_NONE) {
 		_pMovie->setModal(false);
 		_pMovie->setNumOfLoops(1);
diff --git a/engines/bagel/baglib/movie_object.cpp b/engines/bagel/baglib/movie_object.cpp
index e5edeaba10d..1930382fcf0 100644
--- a/engines/bagel/baglib/movie_object.cpp
+++ b/engines/bagel/baglib/movie_object.cpp
@@ -72,6 +72,7 @@ CBagMovieObject::~CBagMovieObject() {
 }
 
 bool CBagMovieObject::runObject() {
+	CBagPDA *pPDA = nullptr;
 	CBofWindow *pNewWin = nullptr;
 	SBZoomPda *pPDAz = (SBZoomPda *)g_SDevManager->getStorageDevice("BPDAZ_WLD");
 	bool bZoomed = (pPDAz == nullptr ? false : pPDAz->getZoomed());
@@ -145,7 +146,7 @@ bool CBagMovieObject::runObject() {
 			CBagStorageDevWnd *pSDevWnd = (pWnd ? pWnd->getCurrentStorageDev() : nullptr);
 
 			// Get the pda here, we need it so much anyway.
-			CBagPDA *pPDA = (CBagPDA *)g_SDevManager->getStorageDevice("BPDA_WLD");
+			pPDA = (CBagPDA *)g_SDevManager->getStorageDevice("BPDA_WLD");
 
 			assert(pPDA != nullptr);
 
diff --git a/engines/bagel/baglib/paint_table.cpp b/engines/bagel/baglib/paint_table.cpp
index a0581eb4e3f..a36ba7fa4d7 100644
--- a/engines/bagel/baglib/paint_table.cpp
+++ b/engines/bagel/baglib/paint_table.cpp
@@ -40,7 +40,7 @@ void PaintTable::initialize(Common::SeekableReadStream &src) {
 			for (int pointNum = 0; pointNum < 10; ++pointNum, ++pointIndex) {
 				// Get the point
 				int y1 = 0, y2 = 0;
-				int result = sscanf_s(line.c_str(), "{ %d,%d}", &y1, &y2);
+				int result = sscanf(line.c_str(), "{ %d,%d}", &y1, &y2);
 				assert(result == 2);
 
 				STRIP_POINTS[stripNum][pointIndex]._top = y1;
diff --git a/engines/bagel/baglib/pan_window.cpp b/engines/bagel/baglib/pan_window.cpp
index 3e8db2605d6..4558d9dcc8e 100644
--- a/engines/bagel/baglib/pan_window.cpp
+++ b/engines/bagel/baglib/pan_window.cpp
@@ -45,6 +45,8 @@ void CBagPanWindow::initialize() {
 }
 
 CBagPanWindow::CBagPanWindow() : CBagStorageDevWnd() {
+	CBofRect tmpRect;
+
 	_xViewPortPos = CBofPoint(0, 20);
 	_xMovementRect.setRectEmpty();
 
@@ -256,7 +258,8 @@ ErrorCode CBagPanWindow::onRender(CBofBitmap *pBmp, CBofRect *pRect) {
 
 			if (isFiltered()) {
 				uint16 nFilterId = getFilterId();
-				bool bFiltered = (*_pBitmapFilter)(nFilterId, pBmp, pRect);
+				bool bFiltered = false;
+				bFiltered = (*_pBitmapFilter)(nFilterId, pBmp, pRect);
 
 				if (bFiltered) {
 					setPreFilterPan(true);
@@ -557,8 +560,10 @@ void CBagPanWindow::onMouseMove(uint32 nFlags, CBofPoint *p, void *) {
 		}
 	}
 
+	CBagObject *pObj = getLActiveObject();
+
 	if (_bDraggingObject) {
-		CBagObject *pObj = _pFGObjectList->getNodeItem(_pFGObjectList->getCount() - 1);
+		pObj = _pFGObjectList->getNodeItem(_pFGObjectList->getCount() - 1);
 		pObj->setPosition(xPoint);
 	}
 
diff --git a/engines/bagel/baglib/parse_object.cpp b/engines/bagel/baglib/parse_object.cpp
index 196d1ace4c0..60420eea6d4 100644
--- a/engines/bagel/baglib/parse_object.cpp
+++ b/engines/bagel/baglib/parse_object.cpp
@@ -32,7 +32,7 @@ CBagParseObject::CBagParseObject() {
 }
 
 int CBagParseObject::getIntFromStream(CBagIfstream &istr, int &nNum) {
-	char ch;
+	char ch = 0;
 	char szLocalStr[256];
 	int i = 0;