[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.24,1.25 logic.cpp,1.105,1.106

[Gregory Montoir]

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

Modified Files:
	command.cpp logic.cpp 
Log Message:
clear current command *in* Command class (not logic)

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- command.cpp	26 Nov 2003 20:40:43 -0000	1.24
+++ command.cpp	26 Nov 2003 21:08:36 -0000	1.25
@@ -843,11 +843,11 @@
 	if (strlen(description) > 4 && 
 		scumm_stricmp(description + strlen(description) - 4, ".cut") == 0) {
 
-//		_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
-		clear(true);
-
 		char nextCutaway[20];
 		memset(nextCutaway, 0, sizeof(nextCutaway));
+
+		clear(true); // clear as Talk::speak() can be called in a Cutaway
+
 		_logic->playCutaway(description, nextCutaway);
 		while (nextCutaway[0] != '\0') {
 			_logic->playCutaway(nextCutaway, nextCutaway);
@@ -861,13 +861,14 @@
 bool Command::executeIfDialog(const char *description) {
 
 	if (strlen(description) > 4 && 
-			scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) {
+		scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) {
+
 		char cutaway[20];
+		memset(cutaway, 0, sizeof(cutaway));
 
-//		_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
+		int person = _selCmd.noun;
 		clear(true);
-
-		_logic->dialogue(description, _selCmd.noun, cutaway);
+		_logic->dialogue(description, person, cutaway);
 
 		while (cutaway[0] != '\0') {
 			char currentCutaway[20];
@@ -893,7 +894,6 @@
 		if (_selCmd.action.isNone()) {
 			_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
 		}
-debug(0, "_walk->moveJoe(%d, %d)", _selPosX, _selPosY);
 		_walk->moveJoe(0, _selPosX, _selPosY, false); // XXX inCutaway parameter
 		return true;
 	}

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- logic.cpp	26 Nov 2003 20:40:43 -0000	1.105
+++ logic.cpp	26 Nov 2003 21:08:36 -0000	1.106
@@ -1858,7 +1858,6 @@
 		cutaway = cutawayFile;
 	}
 	_display->fullscreen(true);
-	_cmd->clear(false);
 	Talk::talk(dlgFile, personInRoom, cutaway, _graphics, _input, this, _resource, _sound);
 	_display->fullscreen(false);
 }