XEEN: Refacored face sprites loading into Roster and Character classes

1 files changed, 15 insertions, 3 deletions

diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index 6bff8fd995..e0110856a6 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -32,10 +32,22 @@
 
 namespace Xeen {
 
-void Roster::synchronize(Common::Serializer &s) {
-	if (s.isLoading())
-		resize(30);
+Roster::Roster() {
+	resize(TOTAL_CHARACTERS);
+
+	for (int idx = 0; idx < TOTAL_CHARACTERS; ++idx) {
+		if (idx < XEEN_TOTAL_CHARACTERS) {
+			// Load new character resource
+			Common::String name = Common::String::format("char%02d.fac", idx + 1);
+			_charFaces[idx].load(name);
+			operator[](idx)._faceSprites = &_charFaces[idx];
+		} else {
+			operator[](idx)._faceSprites = nullptr;
+		}
+	}
+}
 
+void Roster::synchronize(Common::Serializer &s) {
 	for (uint i = 0; i < 30; ++i)
 		(*this)[i].synchronize(s);
 }