[Scummvm-git-logs] scummvm master -> 54200f9ec6b4e69ce1cc9c5f2a9f92301ad96e57

dreammaster noreply at scummvm.org
Wed Mar 8 06:58:27 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:
54200f9ec6 MM: MM1: Add Y/N buttons to create characters summary


Commit: 54200f9ec6b4e69ce1cc9c5f2a9f92301ad96e57
    https://github.com/scummvm/scummvm/commit/54200f9ec6b4e69ce1cc9c5f2a9f92301ad96e57
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-07T22:58:18-08:00

Commit Message:
MM: MM1: Add Y/N buttons to create characters summary

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


diff --git a/engines/mm/mm1/events.cpp b/engines/mm/mm1/events.cpp
index 7179df9f290..4123622563b 100644
--- a/engines/mm/mm1/events.cpp
+++ b/engines/mm/mm1/events.cpp
@@ -52,7 +52,7 @@ void Events::runGame() {
 	int saveSlot = ConfMan.getInt("save_slot");
 	if (saveSlot == -1 ||
 			g_engine->loadGameState(saveSlot).getCode() != Common::kNoError) {
-		addView("CreateCharacters");// "Title");
+		addView("Title");
 	}
 
 	Common::Event e;
diff --git a/engines/mm/mm1/views_enh/create_characters.cpp b/engines/mm/mm1/views_enh/create_characters.cpp
index 99740addc02..d84f3d5ab02 100644
--- a/engines/mm/mm1/views_enh/create_characters.cpp
+++ b/engines/mm/mm1/views_enh/create_characters.cpp
@@ -386,7 +386,6 @@ void CreateCharacters::printSummary() {
 	writeString(_newChar._name);
 
 	writeLine(12, STRING["dialogs.create_characters.save_character"], ALIGN_MIDDLE, RIGHT_X);
-	writeLine(14, "(Y/N)?", ALIGN_MIDDLE, RIGHT_X);
 }
 
 bool CreateCharacters::msgKeypress(const KeypressMessage &msg) {
@@ -555,8 +554,14 @@ void CreateCharacters::setState(State state) {
 	setButtonEnabled(4, _state == SELECT_PORTRAIT);
 	removeButtons(5, -1);
 
-	if (_state == SELECT_CLASS)
+	if (_state == SELECT_CLASS) {
 		_newChar.reroll();
+	} else if (_state == SAVE_PROMPT) {
+		addButton(&g_globals->_confirmIcons, Common::Point(185, 122), 0,
+			Common::KeyState(Common::KEYCODE_y, 'y'));
+		addButton(&g_globals->_confirmIcons, Common::Point(215, 122), 2,
+			Common::KeyState(Common::KEYCODE_n, 'n'));
+	}
 
 	if (_state == SELECT_NAME) {
 		draw();




More information about the Scummvm-git-logs mailing list