[Scummvm-cvs-logs] scummvm master -> 1f405afbda0c74f0c1ca02921c299a50da87d7d1
Strangerke
Strangerke at scummvm.org
Mon Nov 14 18:27:51 CET 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:
1f405afbda CGE: Add check in order to avoid the display of empty text-boxes
Commit: 1f405afbda0c74f0c1ca02921c299a50da87d7d1
https://github.com/scummvm/scummvm/commit/1f405afbda0c74f0c1ca02921c299a50da87d7d1
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-14T09:27:26-08:00
Commit Message:
CGE: Add check in order to avoid the display of empty text-boxes
Changed paths:
engines/cge/text.cpp
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 021dad5..d426787 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -135,6 +135,13 @@ char *Text::getText(int ref) {
void Text::say(const char *text, Sprite *spr) {
_vm->killText();
+
+ if (!text)
+ return;
+
+ if (*text == 0)
+ return;
+
_vm->_talk = new Talk(_vm, text, kTBRound);
if (!_vm->_talk)
return;
@@ -180,6 +187,9 @@ void CGEEngine::inf(const char *text) {
if (!text)
return;
+ if (*text == 0)
+ return;
+
killText();
_talk = new Talk(this, text, kTBRect);
if (!_talk)
More information about the Scummvm-git-logs
mailing list