[Scummvm-cvs-logs] CVS: scummvm/queen command.h,1.9,1.10 command.cpp,1.31,1.32 logic.cpp,1.114,1.115

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv32523

Modified Files:
	command.h command.cpp logic.cpp 
Log Message:
fix a potiental journal issue

Index: command.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- command.h	2 Dec 2003 16:49:56 -0000	1.9
+++ command.h	2 Dec 2003 19:58:30 -0000	1.10
@@ -109,7 +109,7 @@
 
 private:
 
-	void executeCommand(uint16 comId, int16 condResult);
+	int16 executeCommand(uint16 comId, int16 condResult);
 
 	int16 makeJoeWalkTo(int16 x, int16 y, int16 objNum, const Verb &v, bool mustWalk);
 

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- command.cpp	2 Dec 2003 16:49:56 -0000	1.31
+++ command.cpp	2 Dec 2003 19:58:31 -0000	1.32
@@ -247,14 +247,12 @@
 		}
 		else if (cond >= 0) {
 			// we've had a successful Gamestate check, so we must now exit
-			executeCommand(comId, cond);
+			cond = executeCommand(comId, cond);
 			break;
 		}
 	}
 
-
-	if (_selCmd.action.value() == VERB_LOOK_AT) {
-		// Look At, do standard look at routine
+	if (cond <= 0 && _selCmd.action.value() == VERB_LOOK_AT) {
 		look();
 	}
 	else {
@@ -358,7 +356,7 @@
 }
 
 
-void Command::executeCommand(uint16 comId, int16 condResult) {
+int16 Command::executeCommand(uint16 comId, int16 condResult) {
 
 	// execute.c l.313-452
 	debug(0, "Command::executeCommand() - cond = %X, com = %X", condResult, comId);
@@ -448,7 +446,7 @@
 	switch (com->specialSection) {
 	case 1:
 		_logic->useJournal();
-		return;
+		return condResult;
 	case 2:
 		_logic->joeUseDress(true);
 		break;
@@ -477,6 +475,7 @@
 	if (condResult > 0) {
 		_logic->joeSpeak(condResult, true);
 	}
+	return condResult;
 }
 
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- logic.cpp	2 Dec 2003 16:49:56 -0000	1.114
+++ logic.cpp	2 Dec 2003 19:58:31 -0000	1.115
@@ -1908,6 +1908,7 @@
 	if (next == NULL) {
 		next = nextFile;
 	}
+	_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
 	Cutaway::run(cutFile, next, _graphics, _input, this, _resource, _sound);
 }