[Scummvm-git-logs] scummvm master -> 4ec2fbdb387cc3e156ec9ff399b847217a785b71

[dreammaster]

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:
4ec2fbdb38 MM: MM1: Fix portrait validation


Commit: 4ec2fbdb387cc3e156ec9ff399b847217a785b71
    https://github.com/scummvm/scummvm/commit/4ec2fbdb387cc3e156ec9ff399b847217a785b71
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-06-04T20:48:32-07:00

Commit Message:
MM: MM1: Fix portrait validation

Changed paths:
    engines/mm/mm1/data/character.cpp


diff --git a/engines/mm/mm1/data/character.cpp b/engines/mm/mm1/data/character.cpp
index c1bbf096b57..4ec11b61dbc 100644
--- a/engines/mm/mm1/data/character.cpp
+++ b/engines/mm/mm1/data/character.cpp
@@ -232,8 +232,8 @@ void Character::synchronize(Common::Serializer &s, int portraitNum) {
 	if (s.isLoading()) {
 		if (portraitNum != -1)
 			_portrait = portraitNum;
-		else if (portraitNum >= NUM_PORTRAITS)
-			// Ensure only valid portrait numbers are specified
+		if (_portrait >= NUM_PORTRAITS)
+			// Ensure portrait number is valid
 			_portrait = 0;
 	}