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

[lskovlun at users.sourceforge.net]

Revision: 52676
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52676&view=rev
Author:   lskovlun
Date:     2010-09-11 13:30:42 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
SCI: In kFormat, handle arguments pointing to text resource 0 correctly.
Fixes Colonel's Bequest inventory formatting.

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

Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp	2010-09-11 10:03:31 UTC (rev 52675)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp	2010-09-11 13:30:42 UTC (rev 52676)
@@ -275,7 +275,7 @@
 					reg = readSelector(s->_segMan, reg, SELECTOR(data));
 #endif
 
-				Common::String tempsource = (reg == NULL_REG) ? "" : g_sci->getKernel()->lookupText(reg,
+				Common::String tempsource = g_sci->getKernel()->lookupText(reg,
 				                                  arguments[paramindex + 1]);
 				int slen = strlen(tempsource.c_str());
 				int extralen = str_leng - slen;


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