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

svn-id: r11267

5 files changed, 10 insertions, 7 deletions

diff --git a/queen/command.cpp b/queen/command.cpp
index 229b1199f0..7d7c8ccca9 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -841,6 +841,9 @@ bool Command::executeIfCutaway(const char *description) {
 
 	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);
diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 9023ea11e0..42a744cfe9 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -325,7 +325,6 @@ void BobSlot::animReset() {
 
 	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;
diff --git a/queen/logic.cpp b/queen/logic.cpp
index a3eb630623..ffc9f009d0 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -2316,9 +2316,11 @@ void Logic::handlePinnacleRoom() {
 
 	// 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 @@ void Logic::sceneStart(bool showMouseCursor) {
 	_display->mouseCursorShow(showMouseCursor);
 
 	if (1 == _scene && _input->cutawayRunning()) {
-		_display->panel(false);
+		_display->panel(true);
 		_display->palFadePanel();
 	}
 
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 1526c8f7e8..b70e77e976 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -128,7 +128,6 @@ void QueenEngine::roomChanged() {
 	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");
diff --git a/queen/talk.cpp b/queen/talk.cpp
index 4e13c538e6..48c9145f91 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -1322,12 +1322,12 @@ int16 Talk::selectSentence() {
 
 						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;