ENGINES: Fix appearance loading in KotOR games

xoreos · Jun 11, 2018 · 1d8fe48 · 1d8fe48
1 parent dfdddec
commit 1d8fe48
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/src/engines/kotor/creature.cpp b/src/engines/kotor/creature.cpp
@@ -276,21 +276,17 @@ void Creature::getPartModels(PartModels &parts, uint32 state) {
 
 	_modelType = appearance.getString("modeltype");
 
-	parts.body = appearance.getString(Common::UString("model") + state);
-	Common::UString race = appearance.getString("race");
-	if (parts.body.empty() ||
-			// Special case, e.g., sith guards in korr_m35aa
-			(!race.empty() && parts.body.stricmp("N_Smuggler") == 0))
-		parts.body = race;
-
-	parts.bodyTexture = appearance.getString(Common::UString("tex") + state);
-	if (!parts.bodyTexture.empty())
-		parts.bodyTexture += "01";
-
-	if (parts.bodyTexture.empty() ||
-			// Special case, e.g., sith guards in korr_m35aa
-			(!race.empty() && parts.bodyTexture.stricmp("N_Smuggler01") == 0))
+	// TODO: load state based on character equipment
+	if (appearance.getString("label").beginsWith("Party_"))
+		state = 'b';
+
+	if (_modelType == "B") {
+		parts.body = appearance.getString(Common::UString("model") + state);
+		parts.bodyTexture = appearance.getString(Common::UString("tex") + state) + "01";
+	} else {
+		parts.body = appearance.getString("race");
 		parts.bodyTexture = appearance.getString("racetex");
+	}
 
 	if ((_modelType == "B") || (_modelType == "P")) {
 		const int headNormalID = appearance.getInt("normalhead");

diff --git a/src/engines/kotor/creature.h b/src/engines/kotor/creature.h
@@ -152,7 +152,7 @@ class Creature : public Object {
 	void loadPortrait(const Aurora::GFF3Struct &gff);
 	void loadAppearance();
 
-	void getPartModels(PartModels &parts, uint32 state = 'b');
+	void getPartModels(PartModels &parts, uint32 state = 'a');
 	void loadBody(PartModels &parts);
 	void loadHead(PartModels &parts);
 

diff --git a/src/engines/kotor2/creature.cpp b/src/engines/kotor2/creature.cpp
@@ -209,16 +209,17 @@ void Creature::getPartModels(PartModels &parts, uint32 state) {
 
 	_modelType = appearance.getString("modeltype");
 
-	parts.body = appearance.getString(Common::UString("model") + state);
-	if (parts.body.empty())
+	// TODO: load state based on character equipment
+	if (appearance.getString("label").beginsWith("Party_"))
+		state = 'b';
+
+	if (_modelType == "B") {
+		parts.body = appearance.getString(Common::UString("model") + state);
+		parts.bodyTexture = appearance.getString(Common::UString("tex") + state) + "01";
+	} else {
 		parts.body = appearance.getString("race");
-
-	parts.bodyTexture = appearance.getString(Common::UString("tex") + state);
-	if (!parts.bodyTexture.empty())
-		parts.bodyTexture += "01";
-
-	if (parts.bodyTexture.empty())
 		parts.bodyTexture = appearance.getString("racetex");
+	}
 
 	if ((_modelType == "B") || (_modelType == "P")) {
 		const int headNormalID = appearance.getInt("normalhead");

diff --git a/src/engines/kotor2/creature.h b/src/engines/kotor2/creature.h
@@ -131,7 +131,7 @@ class Creature : public Object {
 	void loadPortrait(const Aurora::GFF3Struct &gff);
 	void loadAppearance();
 
-	void getPartModels(PartModels &parts, uint32 state = 'b');
+	void getPartModels(PartModels &parts, uint32 state = 'a');
 	void loadBody(PartModels &parts);
 	void loadHead(PartModels &parts);