DIRECTOR: LINGO: Moved all codes to separate class to lessen Lingo class pollution

1 files changed, 7 insertions, 6 deletions

diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 7d9f1577e1..fe452b277d 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -45,6 +45,7 @@
 
 #include "director/director.h"
 #include "director/lingo/lingo.h"
+#include "director/lingo/lingo-code.h"
 
 #include "director/util.h"
 
@@ -355,16 +356,16 @@ void Lingo::clearArgStack() {
 
 void Lingo::codeArgStore() {
 	for (int i = _argstack.size() - 1; i >= 0; i--) {
-		code1(c_varpush);
+		code1(g_lc->c_varpush);
 		codeString(_argstack[i]->c_str());
-		code1(c_assign);
+		code1(g_lc->c_assign);
 	}
 }
 
 int Lingo::codeSetImmediate(bool state) {
 	g_lingo->_immediateMode = state;
 
-	int res = g_lingo->code1(g_lingo->c_setImmediate);
+	int res = g_lingo->code1(g_lc->c_setImmediate);
 	inst i = 0;
 	WRITE_UINT32(&i, state);
 	g_lingo->code1(i);
@@ -373,7 +374,7 @@ int Lingo::codeSetImmediate(bool state) {
 }
 
 int Lingo::codeFunc(Common::String *s, int numpar) {
-	int ret = g_lingo->code1(g_lingo->c_call);
+	int ret = g_lingo->code1(g_lc->c_call);
 
 	g_lingo->codeString(s->c_str());
 
@@ -387,13 +388,13 @@ int Lingo::codeFunc(Common::String *s, int numpar) {
 int Lingo::codeMe(Common::String *method, int numpar) {
 	// Check if need to encode reference to the factory
 	if (method == nullptr) {
-		int ret = g_lingo->code1(g_lingo->c_factory);
+		int ret = g_lingo->code1(g_lc->c_factory);
 		g_lingo->codeString(g_lingo->_currentFactory.c_str());
 
 		return ret;
 	}
 
-	int ret = g_lingo->code1(g_lingo->c_call);
+	int ret = g_lingo->code1(g_lc->c_call);
 
 	Common::String m(g_lingo->_currentFactory);