aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2007-04-01 12:17:38 +0000
committerNicola Mettifogo2007-04-01 12:17:38 +0000
commita6ad021b30c34e3e182f60dc5608806ec57dbe45 (patch)
tree33af66f3dfe655493c1b7197d4f285336742fd6e
parent5a313074bc304940699b15ea8d61d00535a3a732 (diff)
downloadscummvm-rg350-a6ad021b30c34e3e182f60dc5608806ec57dbe45.tar.gz
scummvm-rg350-a6ad021b30c34e3e182f60dc5608806ec57dbe45.tar.bz2
scummvm-rg350-a6ad021b30c34e3e182f60dc5608806ec57dbe45.zip
Function changeCharacter is now responsible for loading character specific Zones and such
svn-id: r26339
-rw-r--r--engines/parallaction/parallaction.cpp2
-rw-r--r--engines/parallaction/saveload.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 490e2115de..fbc0be9bdf 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -820,6 +820,8 @@ void Parallaction::changeCharacter(const char *name) {
else
_vm->_char._ani._cnv = _vm->_char._normalFrames;
+ parseLocation("common");
+
strcpy(_characterName1, v32);
return;
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 2677c6c132..13a75bf4a2 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -132,7 +132,7 @@ void Parallaction::doLoadGame(uint16 slot) {
// refreshInventory(_vm->_characterName);
- parseLocation("common");
+// parseLocation("common");
// force reload of character to solve inventory
// bugs, but it's a good maneuver anyway