From d1347b0ce120b3fef101de0736c243a82932c583 Mon Sep 17 00:00:00 2001
From: Scott Percival
Date: Sun, 22 Dec 2019 19:03:08 +0800
Subject: DIRECTOR: LINGO: Add define() support for bytecode

---
 engines/director/score.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'engines/director/score.cpp')

diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 062cff06bd..0d89aef723 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -175,6 +175,18 @@ void Score::loadArchive() {
 		}
 	}
 
+	// Try to load script name lists
+	if (_vm->getVersion() >= 4) {
+		Common::Array<uint16> lnam =  _movieArchive->getResourceIDList(MKTAG('L','n','a','m'));
+		if (lnam.size() > 0) {
+			debugC(2, kDebugLoading, "****** Loading %d Lnam resources", lnam.size());
+
+			for (Common::Array<uint16>::iterator iterator = lnam.begin(); iterator != lnam.end(); ++iterator) {
+				loadLingoNames(*_movieArchive->getResource(MKTAG('L','n','a','m'), *iterator));
+			}
+		}
+	}
+
 	Common::Array<uint16> vwci = _movieArchive->getResourceIDList(MKTAG('V', 'W', 'C', 'I'));
 	if (vwci.size() > 0) {
 		debugC(2, kDebugLoading, "****** Loading %d CastInfos", vwci.size());
@@ -197,19 +209,6 @@ void Score::loadArchive() {
 	setSpriteCasts();
 	loadSpriteImages(false);
 
-	// Try to load script name lists
-	if (_vm->getVersion() >= 4) {
-		Common::Array<uint16> lnam =  _movieArchive->getResourceIDList(MKTAG('L','n','a','m'));
-		if (lnam.size() > 0) {
-			debugC(2, kDebugLoading, "****** Loading %d Lnam resources", lnam.size());
-
-			for (Common::Array<uint16>::iterator iterator = lnam.begin(); iterator != lnam.end(); ++iterator) {
-				loadLingoNames(*_movieArchive->getResource(MKTAG('L','n','a','m'), *iterator));
-			}
-		}
-	}
-
-
 	// Now process STXTs
 	Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T'));
 	debugC(2, kDebugLoading, "****** Loading %d STXT resources", stxt.size());
-- 
cgit v1.2.3