[Scummvm-git-logs] scummvm master -> eb61f5f90cd4c803ef04948a32ed3b6bd19c9661

[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:
eb61f5f90c MM: MM1: Encounter options display


Commit: eb61f5f90cd4c803ef04948a32ed3b6bd19c9661
    https://github.com/scummvm/scummvm/commit/eb61f5f90cd4c803ef04948a32ed3b6bd19c9661
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-25T10:35:19-07:00

Commit Message:
MM: MM1: Encounter options display

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml
    engines/mm/mm1/views_enh/encounter.cpp
    engines/mm/mm1/views_enh/encounter.h


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 29c72261493..fbc07fd9edb 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -530,6 +530,12 @@ enhdialogs:
 		select_portrait: "Select a portrait"
 		select: "\x01""37Select"
 		enter_name: "Enter name:"
+	encounter:
+		options: "Options:"
+		attack: "\x01""37Attack"
+		bribe: "\x01""37Bribe"
+		retreat: "\x01""37Retreat"
+		surrender: "\x01""37Surrender"
 	exchange: "Exhange with whom?"
 	inn:
 		left_click: "Left click potraits to add/remove"
diff --git a/engines/mm/mm1/views_enh/encounter.cpp b/engines/mm/mm1/views_enh/encounter.cpp
index 85c3d6f4a6c..3f364fe02b2 100644
--- a/engines/mm/mm1/views_enh/encounter.cpp
+++ b/engines/mm/mm1/views_enh/encounter.cpp
@@ -31,6 +31,7 @@ namespace ViewsEnh {
 
 Encounter::Encounter() : YesNo("Encounter") {
 	setDisplayArea(false);
+	_btnSprites.load("combat.icn");
 }
 
 bool Encounter::msgFocus(const FocusMessage &msg) {
@@ -82,8 +83,13 @@ void Encounter::draw() {
 
 	case ENCOUNTER_OPTIONS: {
 		// Write the encounter options
-		writeString(0, 21, STRING["dialogs.encounter.options1"]);
-		writeString(10, 22, STRING["dialogs.encounter.options2"]);
+		setReduced(false);
+		writeString(0, 5, STRING["enhdialogs.encounter.options"]);
+		setReduced(true);
+		writeString(88, 5, STRING["enhdialogs.encounter.attack"]);
+		writeString(164, 5, STRING["enhdialogs.encounter.retreat"]);
+		writeString(88, 25, STRING["enhdialogs.encounter.bribe"]);
+		writeString(164, 25, STRING["enhdialogs.encounter.surrender"]);
 		break;
 	}
 
@@ -423,6 +429,14 @@ void Encounter::setMode(Mode newMode) {
 
 	if (_mode == SURPRISED_MONSTERS || _mode == BRIBE)
 		openYesNo();
+
+	clearButtons();
+	if (_mode == ENCOUNTER_OPTIONS) {
+		addButton(&_btnSprites, Common::Point(60, 0), 0, Common::KEYCODE_a);
+		addButton(&_btnSprites, Common::Point(136, 0), 8, Common::KEYCODE_r);
+		addButton(&_btnSprites, Common::Point(60, 20), 2, Common::KEYCODE_b);
+		addButton(&_btnSprites, Common::Point(136, 20), 12, Common::KEYCODE_s);
+	}
 }
 
 } // namespace ViewsEnh
diff --git a/engines/mm/mm1/views_enh/encounter.h b/engines/mm/mm1/views_enh/encounter.h
index 8bd827d6daf..fb9f49215ce 100644
--- a/engines/mm/mm1/views_enh/encounter.h
+++ b/engines/mm/mm1/views_enh/encounter.h
@@ -23,6 +23,7 @@
 #define MM1_VIEWS_ENH_ENCOUNTER_H
 
 #include "mm/mm1/views_enh/yes_no.h"
+#include "mm/shared/xeen/sprites.h"
 #include "mm/mm1/events.h"
 
 namespace MM {
@@ -41,6 +42,7 @@ private:
 	enum BribeType { BRIBE_GOLD, BRIBE_GEMS, BRIBE_FOOD };
 	BribeType _bribeType = BRIBE_GOLD;
 	Common::String _bribeTypeStr;
+	Shared::Xeen::SpriteResource _btnSprites;
 
 	/**
 	 * Set display mode