diff options
| author | Lars Skovlund | 2010-09-11 13:30:42 +0000 |
|---|---|---|
| committer | Lars Skovlund | 2010-09-11 13:30:42 +0000 |
| commit | b2be00372217f79d935b687bc3a4bfaa0cb5c894 (patch) | |
| tree | 30cd7a8ce2cfa9727b9e65e32cc53ad8a4bfa796 | |
| parent | a71f3aa99c3464665f45571822cf1eada2693cfe (diff) | |
| download | scummvm-rg350-b2be00372217f79d935b687bc3a4bfaa0cb5c894.tar.gz scummvm-rg350-b2be00372217f79d935b687bc3a4bfaa0cb5c894.tar.bz2 scummvm-rg350-b2be00372217f79d935b687bc3a4bfaa0cb5c894.zip | |
SCI: In kFormat, handle arguments pointing to text resource 0 correctly.
Fixes Colonel's Bequest inventory formatting.
svn-id: r52676
| -rw-r--r-- | engines/sci/engine/kstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp index a7dc445ba2..5ea3178ae5 100644 --- a/engines/sci/engine/kstring.cpp +++ b/engines/sci/engine/kstring.cpp @@ -275,7 +275,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) { 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; |