aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-03-18 08:29:45 +0000
committerNicola Mettifogo2007-03-18 08:29:45 +0000
commit82400277120260fbfbe1cdc7f91618f06d8cecc2 (patch)
tree9a2876ca1afab5337c9136821b8d826618a6da9f /engines/parallaction/parallaction.cpp
parent5ffd410e309171f139f9d71f47bd4309baac8af4 (diff)
downloadscummvm-rg350-82400277120260fbfbe1cdc7f91618f06d8cecc2.tar.gz
scummvm-rg350-82400277120260fbfbe1cdc7f91618f06d8cecc2.tar.bz2
scummvm-rg350-82400277120260fbfbe1cdc7f91618f06d8cecc2.zip
Bug fixed: inventory wasn't refreshed when loading a savegame if character was not switched. To make things clearer, character are now forced to reload all of their data on switch/load.
svn-id: r26190
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 5781c226ba..35c7ba0bc3 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -793,8 +793,9 @@ void Parallaction::changeCharacter(const char *name) {
if (scumm_stricmp(v32, _characterName1)) {
- if (scumm_stricmp(_characterName1, "null"))
- freeCharacter();
+ // freeCharacter takes responsibility for checking
+ // character for sanity before memory is freed
+ freeCharacter();
_disk->selectArchive("disk1");