[Scummvm-git-logs] scummvm master -> 442707aa52bc81adc4215c25c63dedc56b75898b

[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:
442707aa52 MM: MM1: Added missing files from last commit


Commit: 442707aa52bc81adc4215c25c63dedc56b75898b
    https://github.com/scummvm/scummvm/commit/442707aa52bc81adc4215c25c63dedc56b75898b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-06-03T22:54:47-07:00

Commit Message:
MM: MM1: Added missing files from last commit

Changed paths:
  A engines/mm/mm1/views_enh/spells/duplicate_item.cpp
  A engines/mm/mm1/views_enh/spells/duplicate_item.h


diff --git a/engines/mm/mm1/views_enh/spells/duplicate_item.cpp b/engines/mm/mm1/views_enh/spells/duplicate_item.cpp
new file mode 100644
index 00000000000..7e5321c23a6
--- /dev/null
+++ b/engines/mm/mm1/views_enh/spells/duplicate_item.cpp
@@ -0,0 +1,66 @@
+/* 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/spells/recharge_item.h"
+#include "mm/mm1/globals.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Spells {
+
+RechargeItem::RechargeItem() : CharacterInventory("RechargeItem") {
+	clearButtons();
+
+	addButton(2, STRING["enhdialogs.items.buttons.arms"], Common::KEYCODE_a);
+	addButton(6, STRING["enhdialogs.items.buttons.backpack"], Common::KEYCODE_b);
+	addButton(8, STRING["enhdialogs.items.buttons.charge"], Common::KEYCODE_c);
+	addButton(16, STRING["enhdialogs.misc.exit"], Common::KEYCODE_ESCAPE);
+}
+
+bool RechargeItem::msgKeypress(const KeypressMessage &msg) {
+	if (msg.keycode == Common::KEYCODE_a || msg.keycode == Common::KEYCODE_b ||
+			(msg.keycode >= Common::KEYCODE_1 && msg.keycode <= Common::KEYCODE_6)) {
+		// Allow switching between 
+		CharacterInventory::msgKeypress(msg);
+
+	} else if (msg.keycode == Common::KEYCODE_c) {
+		selectButton(BTN_CHARGE);
+	}
+
+	return true;
+}
+
+void RechargeItem::performAction() {
+	assert(_selectedButton == BTN_CHARGE);
+	Inventory &inv = _mode == ARMS_MODE ? g_globals->_currCharacter->_equipped :
+		g_globals->_currCharacter->_backpack;
+
+	bool result = charge(inv, _selectedItem);
+	close();
+
+	g_events->send(InfoMessage(STRING[result ? "spells.done" : "spells.failed"]));
+}
+
+} // namespace Spells
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/spells/duplicate_item.h b/engines/mm/mm1/views_enh/spells/duplicate_item.h
new file mode 100644
index 00000000000..2c6b09dcd85
--- /dev/null
+++ b/engines/mm/mm1/views_enh/spells/duplicate_item.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_SPELLS_RECHARGE_ITEM_H
+#define MM1_VIEWS_ENH_SPELLS_RECHARGE_ITEM_H
+
+#include "mm/mm1/views_enh/character_inventory.h"
+#include "mm/mm1/game/recharge_item.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Spells {
+
+class RechargeItem : public CharacterInventory, public MM1::Game::RechargeItem {
+protected:
+	/**
+	 * Handle action with selected button mode and selected item
+	 */
+	void performAction() override;
+
+public:
+	/**
+	 * Constructor
+	 */
+	RechargeItem();
+
+	/**
+	 * Destructor
+	 */
+	virtual ~RechargeItem() {}
+
+	bool msgKeypress(const KeypressMessage &msg) override;
+};
+
+} // namespace Spells
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif