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

[alxpnv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
04bb1031d5 ASYLUM: fix incorrect expression
ab0609db66 ASYLUM: fix uninitialized member


Commit: 04bb1031d5a5406eafa21a9d2af37689c02ac791
    https://github.com/scummvm/scummvm/commit/04bb1031d5a5406eafa21a9d2af37689c02ac791
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-04T15:46:30+03:00

Commit Message:
ASYLUM: fix incorrect expression

CID 1462750

Changed paths:
    engines/asylum/puzzles/pipes.cpp


diff --git a/engines/asylum/puzzles/pipes.cpp b/engines/asylum/puzzles/pipes.cpp
index f9d7739723..d2ec5a7317 100644
--- a/engines/asylum/puzzles/pipes.cpp
+++ b/engines/asylum/puzzles/pipes.cpp
@@ -63,7 +63,8 @@ const uint32 peepholeResources[] = {15, 15, 15, 15, 32, 15, 15, 15, 15, 15, 15,
 									15, 32, 32, 15, 15, 15, 15, 15, 15, 15, 15, 32, 15, 15, 15, 15, 15, 15, 15};
 
 static BinNum calcStateFromPosition(ConnectorType type, uint32 position) {
-	assert(position--);
+	assert(position);
+	position--;
 	uint32 shift = !!position + !!(position >> 1) + !!(position >> 2);
 
 	return BinNum((type >> shift | type << (4 - shift)) & 0xF);


Commit: ab0609db6672bf0517ec63bb07420bc53ea5454e
    https://github.com/scummvm/scummvm/commit/ab0609db6672bf0517ec63bb07420bc53ea5454e
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-04T15:49:10+03:00

Commit Message:
ASYLUM: fix uninitialized member

CID 1462749

Changed paths:
    engines/asylum/system/savegame.cpp


diff --git a/engines/asylum/system/savegame.cpp b/engines/asylum/system/savegame.cpp
index 720705a753..1042613a01 100644
--- a/engines/asylum/system/savegame.cpp
+++ b/engines/asylum/system/savegame.cpp
@@ -53,6 +53,7 @@ Savegame::Savegame(AsylumEngine *engine) : _vm(engine), _index(0) {
 	memset(&_moviesViewed, 0, sizeof(_moviesViewed));
 	memset(&_savegames, 0, sizeof(_savegames));
 	memset(&_savegameToScene, 0, sizeof(_savegameToScene));
+	_build = 0;
 }
 
 bool Savegame::hasSavegames() const {