[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.91,1.92 command.cpp,1.12,1.13 queen.cpp,1.40,1.41 talk.cpp,1.36,1.37 graphics.cpp,1.44,1.45

Gregory Montoir cyx at users.sourceforge.net
Wed Nov 12 02:51:10 CET 2003


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

Modified Files:
	logic.cpp command.cpp queen.cpp talk.cpp graphics.cpp 
Log Message:
fix some bugs :
- panel not grayed when playing a cutaway
- command text still displayed when playing a cutaway
- panel drawing glitch on pinnacle room exit
- text color on the dialogue choices not updated


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- logic.cpp	10 Nov 2003 14:06:55 -0000	1.91
+++ logic.cpp	12 Nov 2003 10:50:05 -0000	1.92
@@ -2316,9 +2316,11 @@
 
 	// camera follows Joe again
 	_graphics->cameraBob(0);
-
+	
 	// XXX COMPANEL=1;
-	_display->panel(true);
+	// _display->panel(true); // cyx: to me, that's completely useless
+
+	_display->palFadeOut(0, 223, 7);
 }
 
 
@@ -2510,7 +2512,7 @@
 	_display->mouseCursorShow(showMouseCursor);
 
 	if (1 == _scene && _input->cutawayRunning()) {
-		_display->panel(false);
+		_display->panel(true);
 		_display->palFadePanel();
 	}
 

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- command.cpp	8 Nov 2003 23:45:45 -0000	1.12
+++ command.cpp	12 Nov 2003 10:50:05 -0000	1.13
@@ -841,6 +841,9 @@
 
 	if (strlen(description) > 4 && 
 		scumm_stricmp(description + strlen(description) - 4, ".cut") == 0) {
+
+		_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
+
 		char nextCutaway[20];
 		memset(nextCutaway, 0, sizeof(nextCutaway));
 		_logic->playCutaway(description, nextCutaway);

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- queen.cpp	10 Nov 2003 15:45:53 -0000	1.40
+++ queen.cpp	12 Nov 2003 10:50:05 -0000	1.41
@@ -128,7 +128,6 @@
 	if (_logic->currentRoom() == 7) {
 		warning("Room 7 not yet handled!");
 		_logic->handlePinnacleRoom();
-		// XXX fadeout(0,223);
 	}
 	else if (_logic->currentRoom() == FOTAQ_LOGO && _logic->gameState(VAR_INTRO_PLAYED) == 0) {
 		bool pcGamesDemo = _resource->isDemo() && !_resource->exists("pclogo.cut");

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- talk.cpp	10 Nov 2003 14:06:55 -0000	1.36
+++ talk.cpp	12 Nov 2003 10:50:05 -0000	1.37
@@ -1322,12 +1322,12 @@
 
 						if (zone > 0) {
 							for (y = _logic->zoneBox(ZONE_PANEL, zone).y1; y < _logic->zoneBox(ZONE_PANEL, zone).y2; y += 10)
-								_graphics->textColor(y, INK_JOE);
+								_graphics->textColor(150 + y, INK_JOE);
 						}
 
 						if (oldZone > 0) {
 							for (y = _logic->zoneBox(ZONE_PANEL, oldZone).y1; y < _logic->zoneBox(ZONE_PANEL, oldZone).y2; y += 10)
-								_graphics->textColor(y, INK_TALK_NORMAL);
+								_graphics->textColor(150 + y, INK_TALK_NORMAL);
 						}
 
 						oldZone = zone;

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- graphics.cpp	10 Nov 2003 14:06:55 -0000	1.44
+++ graphics.cpp	12 Nov 2003 10:50:05 -0000	1.45
@@ -325,7 +325,6 @@
 
 	if(active && animating) {
 		const AnimFrame *af = anim.string.buffer;
-		printf("animReset() - %X %X", af->frame, af->speed);
 		if (af != NULL) {
 			anim.string.curPos = af;
 			frameNum = af->frame;





More information about the Scummvm-git-logs mailing list