DIRECTOR: Lingo: Simplify CodeId

scummvm · Aug 3, 2016 · f67bcdc · f67bcdc
1 parent fa7725a
commit f67bcdc
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 83 deletions.
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
@@ -220,6 +220,8 @@ bool Lingo::verify(Symbol *s) {
 }
 
 void Lingo::c_eval() {
+	g_lingo->c_varpush();
+
 	Datum d;
 	d = g_lingo->pop();
 

diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
@@ -206,21 +206,6 @@ void Lingo::codeArgStore() {
 	}
 }
 
-int Lingo::codeId(Common::String &s) {
-	return codeId_(s);
-}
-
-int Lingo::codeId_(Common::String &name) {
-	int ret;
-
-	ret = code1(c_varpush);
-
-	codeString(name.c_str());
-	code1(c_eval);
-
-	return ret;
-}
-
 void Lingo::codeLabel(int label) {
 	_labelstack.push_back(label);
 }