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

[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:
f7ed1c8951 BAGEL: Initialize _saveData in Bagel's contructor (CID 1544878), smalls changes in save_game_file.cpp


Commit: f7ed1c8951f8c765fdd57708890e002e62733e8e
    https://github.com/scummvm/scummvm/commit/f7ed1c8951f8c765fdd57708890e002e62733e8e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T18:33:06+01:00

Commit Message:
BAGEL: Initialize _saveData in Bagel's contructor (CID 1544878), smalls changes in save_game_file.cpp

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


diff --git a/engines/bagel/bagel.cpp b/engines/bagel/bagel.cpp
index 2379c19687d..7ed0d811875 100644
--- a/engines/bagel/bagel.cpp
+++ b/engines/bagel/bagel.cpp
@@ -92,6 +92,8 @@ BagelEngine::BagelEngine(OSystem *syst, const ADGameDescription *gameDesc) : Eng
 	CBofSound::initialize();
 	CBofSprite::initialize();
 	CBofWindow::initialize();
+
+	_saveData.clear();
 }
 
 BagelEngine::~BagelEngine() {
diff --git a/engines/bagel/baglib/save_game_file.cpp b/engines/bagel/baglib/save_game_file.cpp
index abfe8caa6f8..ce0515ea4e1 100644
--- a/engines/bagel/baglib/save_game_file.cpp
+++ b/engines/bagel/baglib/save_game_file.cpp
@@ -28,7 +28,7 @@
 
 namespace Bagel {
 
-#define WORLDDIR "$SBARDIR\\WLD\\%s"
+#define WORLD_DIR "$SBARDIR\\WLD\\%s"
 
 void StSavegameHeader::synchronize(Common::Serializer &s) {
 	s.syncBytes((byte *)_szTitle, MAX_SAVE_TITLE);
@@ -122,10 +122,10 @@ void StBagelSave::synchronize(Common::Serializer &s) {
 void StBagelSave::clear() {
 	for (int i = 0; i < MAX_VARS; ++i)
 		_stVarList[i].clear();
-	for (int i = 0; i < MAX_OBJS; ++i)
+	for (int i = 0; i < MAX_OBJS; ++i) {
 		_stObjList[i].clear();
-	for (int i = 0; i < MAX_OBJS; ++i)
 		_stObjListEx[i].clear();
+	}
 
 	Common::fill(_szScript, _szScript + MAX_FNAME, '\0');
 	_nLocType = 0;