aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.cpp
diff options
context:
space:
mode:
authorJames Brown2003-01-26 06:17:25 +0000
committerJames Brown2003-01-26 06:17:25 +0000
commita0b77e7389686d38cf938136e729a5d6fa2dd8be (patch)
tree0a116455d8361189b9bdfb49f49ec49d5de6d2a7 /scumm/resource.cpp
parent5956e5ee183917efa250ce792d54243399a3aadb (diff)
downloadscummvm-rg350-a0b77e7389686d38cf938136e729a5d6fa2dd8be.tar.gz
scummvm-rg350-a0b77e7389686d38cf938136e729a5d6fa2dd8be.tar.bz2
scummvm-rg350-a0b77e7389686d38cf938136e729a5d6fa2dd8be.zip
LCA03 sync: Modified version of the untrap patch, debugger
savegame/loadgame changes, attempts at making the ComI save/load screen (F1) work. The savegame part of the screen does not work due to a crash, the load part SHOULD... but something resets the saveload flags before they are processed (help! :) svn-id: r6545
Diffstat (limited to 'scumm/resource.cpp')
-rw-r--r--scumm/resource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index cd1ad982d4..7614ad8d9b 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -1143,7 +1143,7 @@ byte *Scumm::getStringAddress(int i)
{
byte *b = getResourceAddress(rtString, i);
if (!b)
- return b;
+ return NULL;
if (_features & GF_NEW_OPCODES)
return ((ArrayHeader *)b)->data;