MYST3: Add variables

engines/myst3/console.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "engines/myst3/console.h"
+#include "engines/myst3/variables.h"
 
 namespace Myst3 {
 
@@ -28,6 +29,7 @@ Console::Console(Myst3Engine *vm) : GUI::Debugger(), _vm(vm) {
 	DCmd_Register("infos",				WRAP_METHOD(Console, Cmd_Infos));
 	DCmd_Register("lookAt",				WRAP_METHOD(Console, Cmd_LookAt));
 	DCmd_Register("initScript",			WRAP_METHOD(Console, Cmd_InitScript));
+	DCmd_Register("var",				WRAP_METHOD(Console, Cmd_Var));
 }
 
 Console::~Console() {
@@ -55,6 +57,11 @@ Common::String Console::describeScript(const Common::Array<Opcode> &script) {
 bool Console::Cmd_Infos(int argc, const char **argv) {
 
 	uint16 nodeId = _vm->_node.getId();
+
+	if (argc >= 2) {
+		nodeId = atoi(argv[1]);
+	}
+
 	NodePtr nodeData = _vm->_db->getNodeData(nodeId);
 
 	char roomName[8];
@@ -62,7 +69,7 @@ bool Console::Cmd_Infos(int argc, const char **argv) {
 
 	Common::Point lookAt = _vm->_scene.getMousePos();
 
-	DebugPrintf("current node: %s%d    ", roomName, nodeId);
+	DebugPrintf("node: %s%d    ", roomName, nodeId);
 	DebugPrintf("pitch: %d heading: %d",  lookAt.y, lookAt.x);
 
 	for (uint i = 0; i < nodeData->hotspots.size(); i++) {
@@ -108,4 +115,26 @@ bool Console::Cmd_InitScript(int argc, const char **argv) {
 	return true;
 }
 
+
+bool Console::Cmd_Var(int argc, const char **argv) {
+
+	if (argc != 2 && argc != 3) {
+		DebugPrintf("Usage :\n");
+		DebugPrintf("var variable : Display var value\n");
+		DebugPrintf("var variable value : Change var value\n");
+		return true;
+	}
+
+	uint16 var = atoi(argv[1]);
+	uint16 value = _vm->_vars->get(var);
+
+	if (argc == 3) {
+		value = atoi(argv[2]);
+		_vm->_vars->set(var, value);
+	}
+
+	DebugPrintf("var[%d] : %d\n", var, value);
+	return true;
+}
+
 } /* namespace Myst3 */

engines/myst3/console.h

@@ -45,6 +45,7 @@ private:
 	bool Cmd_Infos(int argc, const char **argv);
 	bool Cmd_LookAt(int argc, const char **argv);
 	bool Cmd_InitScript(int argc, const char **argv);
+	bool Cmd_Var(int argc, const char **argv);
 };
 
 } /* namespace Myst3 */

engines/myst3/module.mk

@@ -11,7 +11,8 @@ MODULE_OBJS := \
 	myst3.o \
 	node.o \
 	scene.o \
-	script.o
+	script.o \
+	variables.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_MYST3), DYNAMIC_PLUGIN)

engines/myst3/myst3.cpp

@@ -34,6 +34,7 @@
 
 #include "engines/myst3/myst3.h"
 #include "engines/myst3/database.h"
+#include "engines/myst3/variables.h"
 
 #include "graphics/jpeg.h"
 #include "graphics/conversion.h"
@@ -49,7 +50,8 @@ namespace Myst3 {
 
 Myst3Engine::Myst3Engine(OSystem *syst, int gameFlags) :
 		Engine(syst), _system(syst),
-		_db(0), _console(0), _scriptEngine(0) {
+		_db(0), _console(0), _scriptEngine(0),
+		_vars(0) {
 	DebugMan.addDebugChannel(kDebugVariable, "Variable", "Track Variable Accesses");
 	DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function");
 	DebugMan.addDebugChannel(kDebugScript, "Script", "Track Script Execution");
@@ -62,6 +64,7 @@ Myst3Engine::~Myst3Engine() {
 	delete _db;
 	delete _scriptEngine;
 	delete _console;
+	delete _vars;
 }
 
 Common::Error Myst3Engine::run() {
@@ -71,6 +74,7 @@ Common::Error Myst3Engine::run() {
 	_console = new Console(this);
 	_scriptEngine = new Script(this);
 	_db = new Database("M3.exe");
+	_vars = new Variables(this);
 
 	goToNode(1, 245); // LEIS
 

engines/myst3/myst3.h

@@ -45,6 +45,7 @@ enum {
 };
 
 class Console;
+class Variables;
 
 class Myst3Engine : public Engine {
 
@@ -53,6 +54,7 @@ protected:
 	virtual Common::Error run();
 	virtual GUI::Debugger *getDebugger() { return (GUI::Debugger *)_console; }
 public:
+	Variables *_vars;
 
 	Myst3Engine(OSystem *syst, int gameFlags);
 	virtual ~Myst3Engine();

engines/myst3/script.cpp

@@ -23,6 +23,7 @@
 #include "engines/myst3/myst3.h"
 #include "engines/myst3/script.h"
 #include "engines/myst3/hotspot.h"
+#include "engines/myst3/variables.h"
 
 namespace Myst3 {
 
@@ -30,8 +31,10 @@ Script::Script(Myst3Engine *vm):
 	_vm(vm) {
 #define OPCODE(op, x) _commands.push_back(Command(op, &Script::x, #x))
 
+	OPCODE(53, varSetValue);
 	OPCODE(138, goToNode);
 	OPCODE(139, goToRoomNode);
+	OPCODE(187, runScriptsFromNode);
 
 #undef OPCODE
 }
@@ -71,6 +74,12 @@ const Common::String Script::describeCommand(uint16 op) {
 	return Common::String::format("%d", op);
 }
 
+void Script::varSetValue(const Opcode &cmd) {
+	debugC(kDebugScript, "Opcode %d: Set var value %d := %d", cmd.op, cmd.args[0], cmd.args[1]);
+
+	_vm->_vars->set(cmd.args[0], cmd.args[1]);
+}
+
 void Script::goToNode(const Opcode &cmd) {
 	debugC(kDebugScript, "Opcode %d: Go to node %d", cmd.op, cmd.args[0]);
 
@@ -83,4 +92,10 @@ void Script::goToRoomNode(const Opcode &cmd) {
 	_vm->goToNode(cmd.args[1], cmd.args[0]);
 }
 
+void Script::runScriptsFromNode(const Opcode &cmd) {
+	debugC(kDebugScript, "Opcode %d: Run scripts from node %d", cmd.op, cmd.args[0]);
+
+	warning("Unimplemented opcode %d", cmd.op);
+}
+
 } /* namespace Myst3 */

engines/myst3/script.h

@@ -57,8 +57,10 @@ private:
 
 	void runOp(const Opcode &op);
 
+	DECLARE_OPCODE(varSetValue);
 	DECLARE_OPCODE(goToNode);
 	DECLARE_OPCODE(goToRoomNode);
+	DECLARE_OPCODE(runScriptsFromNode);
 };
 
 } /* namespace Myst3 */

engines/myst3/variables.cpp

@@ -0,0 +1,50 @@
+/* Residual - A 3D game interpreter
+ *
+ * Residual is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the AUTHORS
+ * file distributed with this source distribution.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ *
+ */
+
+#include "engines/myst3/variables.h"
+
+namespace Myst3 {
+
+Variables::Variables(Myst3Engine *vm):
+	_vm(vm) {
+	memset(&_vars, 0, sizeof(_vars));
+}
+
+Variables::~Variables() {
+}
+
+void Variables::checkRange(uint16 var) {
+	if (var < 1 || var > 2047)
+		error("Variable out of range %d", var);
+}
+
+uint16 Variables::get(uint16 var) {
+	checkRange(var);
+	return _vars[var];
+}
+
+void Variables::set(uint16 var, uint16 value) {
+	checkRange(var);
+	_vars[var] = value;
+}
+
+} /* namespace Myst3 */

engines/myst3/variables.h

@@ -0,0 +1,47 @@
+/* Residual - A 3D game interpreter
+ *
+ * Residual is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the AUTHORS
+ * file distributed with this source distribution.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ *
+ */
+
+#ifndef VARIABLES_H_
+#define VARIABLES_H_
+
+#include "engines/myst3/myst3.h"
+
+namespace Myst3 {
+
+class Variables {
+public:
+	Variables(Myst3Engine *vm);
+	virtual ~Variables();
+
+	uint16 get(uint16 var);
+	void set(uint16 var, uint16 value);
+
+private:
+	Myst3Engine *_vm;
+
+	uint16 _vars[2048];
+
+	void checkRange(uint16 var);
+};
+
+} /* namespace Myst3 */
+#endif /* VARIABLES_H_ */