KOTOR: Enable the recreation of the head in the chargen info class

xoreos · Aug 28, 2018 · 082f59b · 082f59b
1 parent 88f6a88
commit 082f59b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 55 deletions.
diff --git a/src/engines/kotor/gui/chargen/chargeninfo.cpp b/src/engines/kotor/gui/chargen/chargeninfo.cpp
@@ -197,68 +197,27 @@ Creature *CharacterGenerationInfo::getCharacter() const {
 	return creature.release();
 }
 
-Graphics::Aurora::Model *CharacterGenerationInfo::getModel() {
-	// TODO: This duplicates code in Creature::createPC()
+void CharacterGenerationInfo::recreateHead() {
+	Graphics::Aurora::Model *head = _head;
+	_head = loadModelObject(Creature::getHeadMeshString(getGender(), getSkin(), getFace()), "");
+	_body->attachModel("headhook", _head);
+	delete head;
+
+	// Restart animation to apply it to the new head.
+	// TODO: Possibly there is another way of doing this, without restarting the animation?
+	_body->playAnimation("pause1", true, -1);
+}
 
+Graphics::Aurora::Model *CharacterGenerationInfo::getModel() {
 	if (_body)
 		return _body.get();
 
-	Common::UString body, head;
-
-	body = "p";
-	head = "p";
-
-	switch (getGender()) {
-		case kGenderMale:
-			body += "m";
-			head += "m";
-			break;
-		case kGenderFemale:
-			body += "f";
-			head += "f";
-			break;
-		default:
-			throw Common::Exception("Unknown gender");
-	}
-
-	body += "bb";
-	head += "h";
-
-	switch (getClass()) {
-		case kClassSoldier:
-			body += "l";
-			break;
-		case kClassScout:
-			body += "m";
-			break;
-		default:
-		case kClassScoundrel:
-			body += "s";
-			break;
-	}
-
-	_body.reset(loadModelObject(body, ""));
+	_body.reset(loadModelObject(Creature::getBodyMeshString(getGender(), getClass()), ""));
 	if (!_body)
 		return 0;
 
-	switch (getSkin()) {
-		case kSkinA:
-			head += "a";
-			break;
-		case kSkinB:
-			head += "b";
-			break;
-		default:
-		case kSkinC:
-			head += "c";
-			break;
-	}
-
-	head += "0";
-	head += Common::composeString(getFace() + 1);
-
-	Graphics::Aurora::Model *headModel = loadModelObject(head, "");
-	_body->attachModel("headhook", headModel);
+	_head = loadModelObject(Creature::getHeadMeshString(getGender(), getSkin(), getFace()), "");
+	_body->attachModel("headhook", _head);
 
 	return _body.get();
 }

diff --git a/src/engines/kotor/gui/chargen/chargeninfo.h b/src/engines/kotor/gui/chargen/chargeninfo.h
@@ -73,6 +73,8 @@ class CharacterGenerationInfo {
 	void setFace(uint8 face);
 
 	Creature *getCharacter() const;
+
+	void recreateHead();
 	Graphics::Aurora::Model *getModel();
 
 private:
@@ -85,6 +87,7 @@ class CharacterGenerationInfo {
 
 	Common::UString _name;
 
+	Graphics::Aurora::Model *_head;
 	Common::ScopedPtr<Graphics::Aurora::Model> _body;
 };