diff options
| author | Jonathan Gray | 2003-05-19 08:42:10 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-05-19 08:42:10 +0000 |
| commit | 714cd3503d053e65aaaf721d91a0729bf18990d3 (patch) | |
| tree | efdd4f950db847b5aa1de2a41629c20d5685ba52 | |
| parent | 6cb61537f4749e83b7bbdd2294a28f07eb6eeb15 (diff) | |
| download | scummvm-rg350-714cd3503d053e65aaaf721d91a0729bf18990d3.tar.gz scummvm-rg350-714cd3503d053e65aaaf721d91a0729bf18990d3.tar.bz2 scummvm-rg350-714cd3503d053e65aaaf721d91a0729bf18990d3.zip | |
make gui work if the requested string vars don't exist
svn-id: r7674
| -rw-r--r-- | scumm/resource.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 4ef190c25c..a30a21b83c 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -1268,7 +1268,10 @@ byte *Scumm::getStringAddressVar(int i) { addr = getResourceAddress(rtString, _scummVars[i]); if (addr == NULL) - error("NULL string var %d slot %d", i, _scummVars[i]); + // as this is used for string mapping in the gui + // it must be allowed to return NULL + // error("NULL string var %d slot %d", i, _scummVars[i]); + return NULL; if (_features & GF_NEW_OPCODES) return ((ArrayHeader *)addr)->data; |