KOTOR: Enable creation of random names in chargen

xoreos · Jul 16, 2018 · 4ba84e6 · 4ba84e6
1 parent a2b78df
commit 4ba84e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/engines/kotor/gui/chargen/chargenname.cpp b/src/engines/kotor/gui/chargen/chargenname.cpp
@@ -34,20 +34,29 @@ namespace Engines {
 namespace KotOR {
 
 CharacterGenerationNameMenu::CharacterGenerationNameMenu(CharacterGenerationInfo &info, Console *console) :
-		CharacterGenerationBaseMenu(info, console) {
+		CharacterGenerationBaseMenu(info, console),
+		_humanFirst(info.getGender() == kGenderMale ? "humanm" : "humanf"), _humanLast("humanl"),
+		_name(_info.getName()) {
 
 	load("name");
 
 	addBackground(kBackgroundTypeMenu);
 
 	_nameLabel = getLabel("NAME_BOX_EDIT");
-	_nameLabel->setText("_");
+	_nameLabel->setText(_info.getName() + "_");
 
 	EventMan.enableTextInput(true);
 	EventMan.enableKeyRepeat(true);
 }
 
 void CharacterGenerationNameMenu::callbackActive(Widget &widget) {
+	if (widget.getTag() == "BTN_RANDOM") {
+		_name = _humanFirst.generateRandomName(8) + " " + _humanLast.generateRandomName(8);
+		_nameLabel->setText(_name + "_");
+		_info.setName(_name);
+		return;
+	}
+
 	if (widget.getTag() == "BTN_BACK") {
 		_returnCode = 1;
 		EventMan.enableTextInput(false);
@@ -69,6 +78,7 @@ void CharacterGenerationNameMenu::callbackKeyInput(const Events::Key &key, const
 		if (!_name.empty()) {
 			_name.erase(--_name.end());
 			_nameLabel->setText(_name + "_");
+			_info.setName(_name);
 		}
 	}
 }

diff --git a/src/engines/kotor/gui/chargen/chargenname.h b/src/engines/kotor/gui/chargen/chargenname.h
@@ -25,6 +25,8 @@
 #ifndef ENGINES_KOTOR_GUI_CHARGEN_CHARGENNAME_H
 #define ENGINES_KOTOR_GUI_CHARGEN_CHARGENNAME_H
 
+#include "src/aurora/ltrfile.h"
+
 #include "src/engines/kotor/gui/gui.h"
 
 #include "src/engines/kotor/gui/chargen/chargenbase.h"
@@ -42,6 +44,9 @@ class CharacterGenerationNameMenu : public CharacterGenerationBaseMenu {
 	void callbackTextInput(const Common::UString &text);
 	void callbackKeyInput(const Events::Key &key, const Events::EventType &type);
 
+	Aurora::LTRFile _humanFirst;
+	Aurora::LTRFile _humanLast;
+
 	WidgetLabel *_nameLabel;
 	Common::UString _name;
 };