From a318beaa180bb98b49b9023e3eb0ed83fb3e7800 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Wed, 21 May 2003 06:14:02 +0000
Subject: Attempt to fix some stuff

svn-id: r7768
---
 scumm/script_v2.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 2584018f4c..6d013cd7bd 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -874,10 +874,12 @@ void Scumm_v2::o2_doSentence() {
 
 void Scumm_v2::o2_drawSentence() {
 	ScummVM::Rect sentenceline;
-
 	static char sentence[80];
 	int slot = getVerbSlot(_scummVars[VAR_SENTENCE_VERB],0);
 
+	if (_userPut < 1)
+		return;
+
 	strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
 
 	if (_scummVars[27] > 0) {
@@ -1187,6 +1189,8 @@ void Scumm_v2::o2_pickupObject() {
 	// FIXME: Ender Quick Hack to allow further Zak testing.
 	// In reality, we should probably stuff the inventory into verbs
 	// as later games do. Easier hotspot tracking :)
+	if (_userPut < 1)
+		return;
 {
         int i, items = 0, curInventoryCount = 0;
 	bool alternate = false;
@@ -1275,9 +1279,14 @@ void Scumm_v2::o2_cursorCommand() {
 		_scummVars[21] = cmd & 0xFF;
 		printf("Set cmd %d\n", cmd & 0xFF);
 	}
+
 	if (a2 & 4) {
-		_userPut = 1;
-		warning("TODO: o2_cursorCommand(userface)");
+		if (_userPut == 1)
+			_userPut = 0;
+		else
+			_userPut = 1;
+
+		warning("TODO: o2_cursorCommand(userface) -> %d", _userPut);
 	} // Toggle verbs on/off, etc
 
 	if (a2 & 1) {						// Freeze
-- 
cgit v1.2.3