[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.134,1.135

Gregory Montoir cyx at users.sourceforge.net
Mon Dec 15 05:01:06 CET 2003


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

Modified Files:
	logic.cpp 
Log Message:
clear command text in pinnacle room when there is no valid place under the cursor

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- logic.cpp	13 Dec 2003 20:05:28 -0000	1.134
+++ logic.cpp	15 Dec 2003 13:00:48 -0000	1.135
@@ -2163,6 +2163,7 @@
 
 	update();
 	_vm->display()->palFadeIn(0, 223, ROOM_JUNGLE_PINNACLE, joe->active, joe->x, joe->y);
+	_vm->graphics()->textCurrentColor(INK_PINNACLE_ROOM);
 
 	_entryObj = 0;
 	uint16 prevObj = 0;
@@ -2179,6 +2180,8 @@
 		joe->x = piton->x = 3 * mx / 4 + 200;
 		joe->frameNum = mx / 36 + 43 + FRAMES_JOE_XTRA;
 
+		_vm->graphics()->textClear(5, 5);
+
 		uint16 curObj = findObjectUnderCursor(mx, my);
 		if (curObj != 0 && curObj != prevObj) {
 			_entryObj = 0;
@@ -2188,7 +2191,6 @@
 				_entryObj = objData->entryObj;
 				char textCmd[CmdText::MAX_COMMAND_LEN];
 				sprintf(textCmd, "%s %s", verbName(VERB_WALK_TO), _objName[objData->name]);
-				_vm->graphics()->textCurrentColor(INK_PINNACLE_ROOM);
 				_vm->graphics()->textSetCentered(5, textCmd);
 			}
 			prevObj = curObj;





More information about the Scummvm-git-logs mailing list