[Scummvm-cvs-logs] SF.net SVN: scummvm:[44673] scummvm/trunk/engines/sci/engine/kmenu.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 44673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44673&view=rev
Author:   m_kiewitz
Date:     2009-10-05 19:39:47 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
SCI: kDrawStatus now calls s->gui->drawStatus with NULL if no text given

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmenu.cpp

Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-05 19:30:17 UTC (rev 44672)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-05 19:39:47 UTC (rev 44673)
@@ -67,14 +67,17 @@
 
 reg_t kDrawStatus(EngineState *s, int argc, reg_t *argv) {
 	reg_t textReference = argv[0];
-	Common::String text;
+	Common::String textCommon;
+	const char *text = NULL;
 	int16 colorPen = (argc > 1) ? argv[1].toSint16() : 0; // old code was: s->status_bar_foreground;
 	int16 colorBack = (argc > 2) ? argv[2].toSint16() : 255; // s->status_bar_background;
 
-	if (!textReference.isNull())
-		text = s->_segMan->getString(textReference);
+	if (!textReference.isNull()) {
+		textCommon = s->strSplit(s->_segMan->getString(textReference).c_str(), NULL);
+		text = textCommon.c_str();
+	}
 
-	s->gui->drawStatus(s->strSplit(text.c_str(), NULL).c_str(), colorPen, colorBack);
+	s->gui->drawStatus(text, colorPen, colorBack);
 	return s->r_acc;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.