[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.87,2.88

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31201/scumm

Modified Files:
	script_v2.cpp 
Log Message:
Attempt to fix some stuff


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.87
retrieving revision 2.88
diff -u -d -r2.87 -r2.88
--- script_v2.cpp	21 May 2003 06:00:16 -0000	2.87
+++ script_v2.cpp	21 May 2003 06:14:02 -0000	2.88
@@ -874,10 +874,12 @@
 
 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 @@
 	// 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 @@
 		_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