[Scummvm-git-logs] scummvm master -> b2d6206d373107de59552aaa85d92957ef8ee0e9
dreammaster
noreply at scummvm.org
Mon May 22 04:16:16 UTC 2023
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:
b2d6206d37 MM: MM1: Remove debugging lines from Protect view
Commit: b2d6206d373107de59552aaa85d92957ef8ee0e9
https://github.com/scummvm/scummvm/commit/b2d6206d373107de59552aaa85d92957ef8ee0e9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-21T21:16:01-07:00
Commit Message:
MM: MM1: Remove debugging lines from Protect view
Changed paths:
engines/mm/mm1/globals.cpp
engines/mm/mm1/views_enh/protect.cpp
diff --git a/engines/mm/mm1/globals.cpp b/engines/mm/mm1/globals.cpp
index 76fe73c3fdc..2a83cad26cc 100644
--- a/engines/mm/mm1/globals.cpp
+++ b/engines/mm/mm1/globals.cpp
@@ -148,7 +148,6 @@ Common::String Globals::operator[](const Common::String &name) const {
return result;
}
-
void Globals::synchronize(Common::Serializer &s) {
s.syncAsByte(_startingTown);
diff --git a/engines/mm/mm1/views_enh/protect.cpp b/engines/mm/mm1/views_enh/protect.cpp
index 2ba404e83bc..5272827801c 100644
--- a/engines/mm/mm1/views_enh/protect.cpp
+++ b/engines/mm/mm1/views_enh/protect.cpp
@@ -43,7 +43,6 @@ void Protect::draw() {
// Protection spells
for (int i = 0; i < 7; ++i) {
- g_globals->_activeSpells._arr[i] = 3;
if (g_globals->_activeSpells._arr[i]) {
Common::String line = Common::String::format("%s %s + %d%%",
STRING["dialogs.protect.protection"].c_str(),
@@ -54,7 +53,6 @@ void Protect::draw() {
}
// Light spell
- g_globals->_activeSpells._arr[7] = 5;
if (g_globals->_activeSpells._arr[7]) {
writeString(0, yp += 8, Common::String::format("%s%d)",
STRING["dialogs.protect.8"].c_str(),
@@ -63,7 +61,6 @@ void Protect::draw() {
// The rest
for (int i = 8; i < 18; ++i) {
- g_globals->_activeSpells._arr[i] = 3;
if (i == 13)
yp += 8;
@@ -71,7 +68,7 @@ void Protect::draw() {
Common::String line = STRING[Common::String::format(
"dialogs.protect.%d", i + 1)];
if (i == 17) {
- line += Common::String::format(" %d %s",
+ line += Common::String::format("%d %s",
g_globals->_activeSpells._arr[17],
STRING["dialogs.protect.to_attacks"].c_str()
);
More information about the Scummvm-git-logs
mailing list