[Scummvm-cvs-logs] scummvm master -> bd6a05bdd4e71548aadc2c846b6ab16d4d486a2e

bluegr md5 at scummvm.org
Sun Sep 25 23:17:50 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bd6a05bdd4 AGI: Fix bug #3080041 - "AGI Mother Goose: White bar in intro"


Commit: bd6a05bdd4e71548aadc2c846b6ab16d4d486a2e
    https://github.com/scummvm/scummvm/commit/bd6a05bdd4e71548aadc2c846b6ab16d4d486a2e
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-25T14:11:45-07:00

Commit Message:
AGI: Fix bug #3080041 - "AGI Mother Goose: White bar in intro"

Changed paths:
    engines/agi/agi.h
    engines/agi/op_cmd.cpp
    engines/agi/text.cpp



diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index c2af0c5..189eb7d 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -1076,7 +1076,7 @@ public:
 	char *agiSprintf(const char *);
 	void writeStatus();
 	void writePrompt();
-	void clearPrompt();
+	void clearPrompt(bool useBlackBg = false);
 	void clearLines(int, int, int);
 	void flushLines(int, int);
 	bool predictiveDialog();
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 23ccee2..d1db956 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1442,7 +1442,8 @@ void cmdPreventInput(AgiGame *state, uint8 *p) {
 	state->_vm->newInputMode(INPUT_NONE);
 	state->inputEnabled = false;
 
-	state->_vm->clearPrompt();
+	// Always clear with black background. Fixes bug #3080041.
+	state->_vm->clearPrompt(true);
 }
 
 void cmdGetString(AgiGame *state, uint8 *p) {
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 9ac60c0..9ac416e 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -676,11 +676,11 @@ void AgiEngine::writePrompt() {
 	_gfx->doUpdate();
 }
 
-void AgiEngine::clearPrompt() {
+void AgiEngine::clearPrompt(bool useBlackBg) {
 	int l;
 
 	l = _game.lineUserInput;
-	clearLines(l, l, _game.colorBg);
+	clearLines(l, l, useBlackBg ? 0 : _game.colorBg);
 	flushLines(l, l);
 
 	_gfx->doUpdate();






More information about the Scummvm-git-logs mailing list