[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.58,1.59 cutaway.cpp,1.112,1.113 display.cpp,1.54,1.55 queen.cpp,1.74,1.75

[Gregory Montoir]

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

Modified Files:
	command.cpp cutaway.cpp display.cpp queen.cpp 
Log Message:
- wrong sentence was spoken when Joe was trying to 'pick up' a person
- clear command before switching rooms
- clear texts at the end of cutaway (fix minor glitch in interview intro)


Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- command.cpp	11 Jan 2004 14:11:36 -0000	1.58
+++ command.cpp	13 Jan 2004 14:43:13 -0000	1.59
@@ -95,11 +95,11 @@
 
 Command::Command(QueenEngine *vm)
 	: _vm(vm) {
-
 	_cmdText._vm = vm;
 }
 
 void Command::clear(bool clearTexts) {
+	debug(6, "Command::clear(%d)", clearTexts);
 	_cmdText.clear();
 	if (clearTexts) {
 		_vm->display()->clearTexts(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
@@ -152,6 +152,7 @@
 
 	if (comMax == 0) {
 		sayInvalidAction(_state.selAction, _state.subject[0], _state.subject[1]);
+		clear(true);
 		cleanupCurrentAction();
 		return;
 	}
@@ -852,7 +853,7 @@
 		if (subj1 < 0) {
 			_vm->logic()->makeJoeSpeak(14);
 		} else {
-			int16 img = _vm->logic()->objectData(subj2)->image;
+			int16 img = _vm->logic()->objectData(subj1)->image;
 			if (img == -4 || img == -3) {
 				// Trying to get a person
 				_vm->logic()->makeJoeSpeak(20);

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- cutaway.cpp	11 Jan 2004 14:11:36 -0000	1.112
+++ cutaway.cpp	13 Jan 2004 14:43:13 -0000	1.113
@@ -965,6 +965,9 @@
 		}
 
 	} // for()
+	
+	_vm->display()->clearTexts(0, 198);
+	// XXX lines 1887-1895 in cutaway.c
 
 	stop();
 

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- display.cpp	11 Jan 2004 17:20:29 -0000	1.54
+++ display.cpp	13 Jan 2004 14:43:13 -0000	1.55
@@ -749,7 +749,7 @@
 }
 
 void Display::setDirtyBlock(uint16 x, uint16 y, uint16 w, uint16 h) {
-	if (!_fullRefresh) {
+	if (_fullRefresh < 2) {
 		uint16 ex = (x + w - 1) / D_BLOCK_W;
 		uint16 ey = (y + h - 1) / D_BLOCK_H;
 		x /= D_BLOCK_W;

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- queen.cpp	12 Jan 2004 13:40:01 -0000	1.74
+++ queen.cpp	13 Jan 2004 14:43:13 -0000	1.75
@@ -316,7 +316,6 @@
 	for (;;) {
 		// queen.c lines 4080-4104
 		if (_logic->newRoom() > 0) {
-			_display->clearTexts(151, 151);
 			_logic->update();
 			_logic->oldRoom(_logic->currentRoom());
 			_logic->currentRoom(_logic->newRoom());