[Scummvm-git-logs] scummvm master -> 60a06b07ae3fa0f07e7e557f84ef96bb010cd777

[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:
60a06b07ae MM: MM1: Fix incorrect flags access in map 18


Commit: 60a06b07ae3fa0f07e7e557f84ef96bb010cd777
    https://github.com/scummvm/scummvm/commit/60a06b07ae3fa0f07e7e557f84ef96bb010cd777
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-01-22T11:23:37-08:00

Commit Message:
MM: MM1: Fix incorrect flags access in map 18

Changed paths:
    engines/mm/mm1/data/character.h
    engines/mm/mm1/maps/map18.cpp


diff --git a/engines/mm/mm1/data/character.h b/engines/mm/mm1/data/character.h
index bf62e4ea502..7e3abee23b9 100644
--- a/engines/mm/mm1/data/character.h
+++ b/engines/mm/mm1/data/character.h
@@ -202,10 +202,6 @@ enum CharFlags13 {
 	CHARFLAG13_80 = 0x80
 };
 
-enum CharFlags14 {
-	CHARFLAG14_80 = 0x80
-};
-
 class Inventory {
 public:
 	struct Entry {
diff --git a/engines/mm/mm1/maps/map18.cpp b/engines/mm/mm1/maps/map18.cpp
index ad5eb1bce15..a99ba589055 100644
--- a/engines/mm/mm1/maps/map18.cpp
+++ b/engines/mm/mm1/maps/map18.cpp
@@ -151,7 +151,7 @@ void Map18::special07() {
 		Character &c = g_globals->_party[i];
 		g_globals->_currCharacter = &c;
 
-		if (c._flags[14] & CHARFLAG14_80)
+		if (c._flags[13] & CHARFLAG13_80)
 			hasWonGame = true;
 	}