From 10e3a4c0bb27d65ab6e427786d0432981704da4c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 6 Jan 2015 07:29:39 +0100
Subject: ACCESS: MM - Split Display Inventory in 2 versions

---
 engines/access/scripts.cpp | 11 ++++++++---
 engines/access/scripts.h   |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'engines/access')

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2a70fe3542..440ae5e3cc 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -73,7 +73,7 @@ void Scripts::setOpcodes() {
 	COMMAND_LIST[25] = &Scripts::cmdRetPos;
 	COMMAND_LIST[26] = &Scripts::cmdCheckLoc;
 	COMMAND_LIST[27] = &Scripts::cmdSetAnim;
-	COMMAND_LIST[28] = &Scripts::cmdDispInv;
+	COMMAND_LIST[28] = &Scripts::cmdDispInv_v1;
 	COMMAND_LIST[29] = &Scripts::cmdSetAbout;
 	COMMAND_LIST[30] = &Scripts::cmdSetTimer;
 	COMMAND_LIST[31] = &Scripts::cmdCheckTimer;
@@ -122,6 +122,7 @@ void Scripts::setOpcodes() {
 
 void Scripts::setOpcodes_v2() {
 	COMMAND_LIST[15] = &Scripts::cmdSetInventory;
+	COMMAND_LIST[28] = &Scripts::cmdDispInv_v2;
 	COMMAND_LIST[29] = &Scripts::cmdSetTimer;
 	COMMAND_LIST[32] = &Scripts::cmdJumpGoto;
 	COMMAND_LIST[40] = &Scripts::cmdVideoEnded;
@@ -171,7 +172,7 @@ void Scripts::charLoop() {
 }
 
 void Scripts::printWatch() {
-	warning("TODO: printWatch");
+	error("TODO: printWatch");
 }
 
 void Scripts::findNull() {
@@ -462,7 +463,11 @@ void Scripts::cmdSetAnim() {
 		_vm->_animation->setAnimTimer(anim);
 }
 
-void Scripts::cmdDispInv() {
+void Scripts::cmdDispInv_v1() {
+	error("TODO: cmdDisplInv_v1");
+}
+
+void Scripts::cmdDispInv_v2() {
 	_vm->_inventory->newDisplayInv();
 }
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4d074b681a..abb8e5a80c 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -87,7 +87,8 @@ protected:
 	void cmdRetNeg();
 	void cmdCheckLoc();
 	void cmdSetAnim();
-	void cmdDispInv();
+	void cmdDispInv_v1();
+	void cmdDispInv_v2();
 	void cmdSetAbout();
 	void cmdSetTimer();
 	void cmdCheckTimer();
-- 
cgit v1.2.3