[Scummvm-git-logs] scummvm master -> 228c64e04b1161bedced6b74491fac927ff4c5fb

[dreammaster]

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

Summary:
141f97e735 MM: MM1: Fix setting SP for created magic casters
8a48164347 MM: MM1: Fix current HP display in Character Info view
55a1e2856a MM: MM1: Add missing strings
228c64e04b MM: MM1: Fix displaying character info from Inn


Commit: 141f97e73539819cef53f64d3733f554bb6122ab
    https://github.com/scummvm/scummvm/commit/141f97e73539819cef53f64d3733f554bb6122ab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-11-05T17:01:35-10:00

Commit Message:
MM: MM1: Fix setting SP for created magic casters

Changed paths:
    engines/mm/mm1/views_enh/create_characters.cpp


diff --git a/engines/mm/mm1/views_enh/create_characters.cpp b/engines/mm/mm1/views_enh/create_characters.cpp
index d69f428f7e7..e57df977ad7 100644
--- a/engines/mm/mm1/views_enh/create_characters.cpp
+++ b/engines/mm/mm1/views_enh/create_characters.cpp
@@ -184,7 +184,7 @@ void CreateCharacters::NewCharacter::setSP(int amount) {
 	else if (amount >= 13)
 		level = 1;
 
-	re._sp = level + 3;
+	re._sp._base = re._sp._current = level + 3;
 	re._spellLevel = 1;
 }
 


Commit: 8a4816434707fdb0d6a8eaf258aeafd4ced63c42
    https://github.com/scummvm/scummvm/commit/8a4816434707fdb0d6a8eaf258aeafd4ced63c42
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-11-05T17:20:44-10:00

Commit Message:
MM: MM1: Fix current HP display in Character Info view

Changed paths:
    engines/mm/mm1/views_enh/character_info.cpp


diff --git a/engines/mm/mm1/views_enh/character_info.cpp b/engines/mm/mm1/views_enh/character_info.cpp
index 69a638aeed8..6722afb0023 100644
--- a/engines/mm/mm1/views_enh/character_info.cpp
+++ b/engines/mm/mm1/views_enh/character_info.cpp
@@ -260,7 +260,7 @@ void CharacterInfo::drawStats() {
 		c._personality._current, c._endurance._current,
 		c._speed._current, c._accuracy._current,
 		c._luck._current, c._age, c._level._current,
-		c._ac._current, c._hp, c._sp._current, 0,
+		c._ac._current, c._hpCurrent, c._sp._current, 0,
 		c._exp, c._gold, c._gems
 	};
 	const uint BASE[16] = {
@@ -377,7 +377,7 @@ void CharacterInfo::showAttribute(int attrNum) {
 		c._personality._current, c._endurance._current,
 		c._speed._current, c._accuracy._current,
 		c._luck._current, c._age, c._level._current,
-		c._ac._current, c._hp, c._sp._current
+		c._ac._current, c._hpCurrent, c._sp._current
 	};
 	const uint BASE[12] = {
 		c._might._base, c._intelligence._base,


Commit: 55a1e2856abc21d39335d87d469d51d68ba8b713
    https://github.com/scummvm/scummvm/commit/55a1e2856abc21d39335d87d469d51d68ba8b713
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-11-05T17:38:25-10:00

Commit Message:
MM: MM1: Add missing strings

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 9e64b83d4ee..315ea083701 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -881,6 +881,7 @@ spells:
 		46: "Prismatic Light"
 monster_spells:
 	casts: "casts "
+	takes: "takes "
 	fails_to_cast: "fails to cast a spell"
 	not_affected: "is not affected!"
 	breathes: "breathes"
@@ -915,6 +916,7 @@ monster_spells:
 	energy: "energy"
 	swarm: "swarm"
 	breathes: "breathes "
+	points: "points"
 monster_actions:
 	and: "!and "
 	causes_aging: "causes rapid aging"


Commit: 228c64e04b1161bedced6b74491fac927ff4c5fb
    https://github.com/scummvm/scummvm/commit/228c64e04b1161bedced6b74491fac927ff4c5fb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-11-05T17:43:45-10:00

Commit Message:
MM: MM1: Fix displaying character info from Inn

Changed paths:
    engines/mm/mm1/views/locations/inn.cpp
    engines/mm/mm1/views_enh/locations/inn.cpp


diff --git a/engines/mm/mm1/views/locations/inn.cpp b/engines/mm/mm1/views/locations/inn.cpp
index d9c1af09ca0..3ce905ac6d9 100644
--- a/engines/mm/mm1/views/locations/inn.cpp
+++ b/engines/mm/mm1/views/locations/inn.cpp
@@ -116,7 +116,7 @@ bool Inn::msgKeypress(const KeypressMessage &msg) {
 
 			redraw();
 
-		} else if (msg.flags == 0) {
+		} else {
 			// View character
 			g_globals->_currCharacter = &g_globals->_roster[charNum];
 			_characterView.addView();
diff --git a/engines/mm/mm1/views_enh/locations/inn.cpp b/engines/mm/mm1/views_enh/locations/inn.cpp
index fc961a58691..0e7efd3b8b5 100644
--- a/engines/mm/mm1/views_enh/locations/inn.cpp
+++ b/engines/mm/mm1/views_enh/locations/inn.cpp
@@ -177,7 +177,7 @@ bool Inn::msgKeypress(const KeypressMessage &msg) {
 			setButtonEnabled(0, !_partyChars.empty());
 			redraw();
 
-		} else if (msg.flags == 0) {
+		} else {
 			// View character
 			g_globals->_currCharacter = &g_globals->_roster[charNum];
 			_characterView.addView();