[Scummvm-git-logs] scummvm master -> 0345a04e7a52e7ab93c818d3b53264a2bebafaaa

[djsrv]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0345a04e7a DIRECTOR: LINGO: cb_objectpush -> cb_varrefpush


Commit: 0345a04e7a52e7ab93c818d3b53264a2bebafaaa
    https://github.com/scummvm/scummvm/commit/0345a04e7a52e7ab93c818d3b53264a2bebafaaa
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-18T16:34:40-04:00

Commit Message:
DIRECTOR: LINGO: cb_objectpush -> cb_varrefpush

The opcode isn't used just for objects.

Changed paths:
    engines/director/lingo/lingo-bytecode.cpp
    engines/director/lingo/lingo-code.cpp
    engines/director/lingo/lingo-code.h


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index d5e6f32c71..e61231c390 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -76,7 +76,7 @@ static LingoV4Bytecode lingoV4[] = {
 	{ 0x43, LC::c_argcpush,		"b" },
 	// 0x44, push a constant
 	{ 0x45, LC::c_namepush,		"b" },
-	{ 0x46, LC::cb_objectpush,  "b" },
+	{ 0x46, LC::cb_varrefpush,  "b" },
 	{ 0x48, LC::cb_globalpush,	"b" }, // used in event scripts
 	{ 0x49, LC::cb_globalpush,	"b" },
 	{ 0x4a, LC::cb_thepush,		"b" },
@@ -111,7 +111,7 @@ static LingoV4Bytecode lingoV4[] = {
 	{ 0x83, LC::c_argcpush,		"w" },
 	// 0x84, push a constant
 	{ 0x85, LC::c_namepush,		"w" },
-	{ 0x86, LC::cb_objectpush,  "w" },
+	{ 0x86, LC::cb_varrefpush,  "w" },
 	{ 0x88, LC::cb_globalpush,	"w" }, // used in event scripts
 	{ 0x89, LC::cb_globalpush,	"w" },
 	{ 0x8a, LC::cb_thepush,		"w" },
@@ -537,7 +537,7 @@ void LC::cb_objectfieldpush() {
 	g_lingo->push(g_lingo->getObjectProp(object, fieldName));
 }
 
-void LC::cb_objectpush() {
+void LC::cb_varrefpush() {
 	int nameId = g_lingo->readInt();
 	Common::String name = g_lingo->_currentArchive->getName(nameId);
 	Datum result(name);
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 6f7ca917c3..4a03d96ec9 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -147,7 +147,7 @@ static struct FuncDescr {
 	{ LC::cb_objectcall,	"cb_objectcall",	"i" },
 	{ LC::cb_objectfieldassign, "cb_objectfieldassign", "N" },
 	{ LC::cb_objectfieldpush, "cb_objectfieldpush", "N" },
-	{ LC::cb_objectpush,	"cb_objectpush",	"N" },
+	{ LC::cb_varrefpush,	"cb_varrefpush",	"N" },
 	{ LC::cb_theassign,		"cb_theassign",		"N" },
 	{ LC::cb_theassign2,	"cb_theassign2",	"N" },
 	{ LC::cb_thepush,		"cb_thepush",		"N" },
diff --git a/engines/director/lingo/lingo-code.h b/engines/director/lingo/lingo-code.h
index 67dd61f0a3..330ed77c99 100644
--- a/engines/director/lingo/lingo-code.h
+++ b/engines/director/lingo/lingo-code.h
@@ -148,7 +148,7 @@ namespace LC {
 	void cb_objectcall();
 	void cb_objectfieldassign();
 	void cb_objectfieldpush();
-	void cb_objectpush();
+	void cb_varrefpush();
 	void cb_theassign();
 	void cb_theassign2();
 	void cb_thepush();