[Scummvm-git-logs] scummvm master -> 8c6093f5599b86f8ff0c26fb7af07112bc07fc6b

dreammaster noreply at scummvm.org
Sat Apr 1 23:00:37 UTC 2023 

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:
9bfa66bc7a MM: MM1: Beginnings of resistances display interaction
8c6093f559 NEWS: Mention further Nuvie fixes


Commit: 9bfa66bc7a52706d8550ef025853c5b531ddb992
    https://github.com/scummvm/scummvm/commit/9bfa66bc7a52706d8550ef025853c5b531ddb992
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-01T15:59:24-07:00

Commit Message:
MM: MM1: Beginnings of resistances display interaction

Changed paths:
  A engines/mm/mm1/views_enh/interactions/resistances.cpp
  A engines/mm/mm1/views_enh/interactions/resistances.h
    devtools/create_mm/files/mm1/strings_en.yml
    engines/mm/mm1/views_enh/dialogs.h
    engines/mm/module.mk


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 03729f69b37..f4535b8449d 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1028,6 +1028,17 @@ maps:
 		zom1: "\"I am zom, astral brother of zam.\n"
 		zom2: "My clue is 1-15.\""
 		zom3: "You're not the couriers!\""
+	emap02:
+		resistances: "Resistances"
+		morango: "Morango the mystic asks, \"Who shall i measure?\""
+		magic: "Magic"
+		fire: "Fire"
+		cold: "Cold"
+		electricity: "Elc"
+		acid: "Acid"
+		fear: "Fear"
+		poison: "Poison"
+		sleep: "Sleep"
 
 	map03:
 		blacksmith: "\"Mystical Metal Works\""
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index b9fb86da23d..f3f7acc5b06 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -49,6 +49,7 @@
 #include "mm/mm1/views_enh/which_character.h"
 #include "mm/mm1/views_enh/which_item.h"
 #include "mm/mm1/views_enh/who_will_try.h"
+#include "mm/mm1/views_enh/interactions/resistances.h"
 #include "mm/mm1/views_enh/interactions/statue.h"
 #include "mm/mm1/views_enh/locations/blacksmith_items.h"
 #include "mm/mm1/views_enh/locations/blacksmith.h"
@@ -66,6 +67,7 @@ namespace ViewsEnh {
 
 struct Dialogs {
 private:
+	ViewsEnh::Interactions::Resistances _resistances;
 	ViewsEnh::Interactions::Statue _statue;
 	ViewsEnh::Locations::Blacksmith _blacksmith;
 	ViewsEnh::Locations::BlacksmithItems _blacksmithItems;
diff --git a/engines/mm/mm1/views_enh/interactions/resistances.cpp b/engines/mm/mm1/views_enh/interactions/resistances.cpp
new file mode 100644
index 00000000000..887d90178ff
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/resistances.cpp
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "mm/mm1/views_enh/interactions/resistances.h"
+#include "mm/mm1/globals.h"
+
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+Resistances::Resistances() : Interaction("Resistances", 4),
+		PartyView("Resistances") {
+	_title = STRING["maps.emap02.resistances"];
+}
+
+bool Resistances::msgFocus(const FocusMessage &msg) {
+	PartyView::msgFocus(msg);
+
+	Common::String str = "Test";
+	addText(str);
+
+	return true;
+}
+
+void Resistances::draw() {
+	Interaction::draw();
+}
+
+void Resistances::viewAction() {
+	// ?
+}
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/interactions/resistances.h b/engines/mm/mm1/views_enh/interactions/resistances.h
new file mode 100644
index 00000000000..d00ed3f96cf
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/resistances.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MM1_VIEWS_ENH_INTERACTIONS_RESISTANCES_H
+#define MM1_VIEWS_ENH_INTERACTIONS_RESISTANCES_H
+
+#include "mm/mm1/views_enh/interactions/interaction.h"
+#include "mm/mm1/views_enh/party_view.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+class Resistances : public Interaction, public PartyView {
+protected:
+	/**
+	 * Handles any action/press
+	 */
+	void viewAction() override;
+
+public:
+	Resistances();
+
+	/**
+	 * Handles focus
+	 */
+	bool msgFocus(const FocusMessage &msg) override;
+
+	/**
+	 * Draw the location
+	 */
+	void draw() override;
+};
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 98acdbd9a50..02477443db2 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -169,6 +169,7 @@ MODULE_OBJS += \
 	mm1/views_enh/who_will_try.o \
 	mm1/views_enh/yes_no.o \
 	mm1/views_enh/interactions/interaction.o \
+	mm1/views_enh/interactions/resistances.o \
 	mm1/views_enh/interactions/statue.o \
 	mm1/views_enh/locations/blacksmith.o \
 	mm1/views_enh/locations/blacksmith_items.o \


Commit: 8c6093f5599b86f8ff0c26fb7af07112bc07fc6b
    https://github.com/scummvm/scummvm/commit/8c6093f5599b86f8ff0c26fb7af07112bc07fc6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-01T16:00:23-07:00

Commit Message:
NEWS: Mention further Nuvie fixes

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 9351658bc71..2011b54163c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -46,6 +46,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix Ultima VI crash opening new-style spellbook gump.
    - Fix Ultima VI actor doll and gump colors.
    - Fix Ultima VI crash using look action on walls.
+   - Fix several other miscellaneous crashes.
+   - Fix spawners and projectiles to more closely match the original.
 
  Voyeur:
    - Added support for German fan translation.

More information about the Scummvm-git-logs mailing list