diff options
| author | Christopher Page | 2008-08-16 04:30:01 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-16 04:30:01 +0000 |
| commit | 909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9 (patch) | |
| tree | c2f2668391fa3026a6a79b38ebfad797ce1b376c /engines/parallaction/parallaction_ns.cpp | |
| parent | c22f9b23588121d41fe0a12ce44926d683d7a18d (diff) | |
| parent | f2111eeb45dc8c41afb3e63bf3b86a09bf9a3532 (diff) | |
| download | scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.gz scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.bz2 scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.zip | |
Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33924
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index f3c2656001..eab08142d4 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -220,7 +220,7 @@ void Parallaction_ns::callFunction(uint index, void* parm) { int Parallaction_ns::go() { renameOldSavefiles(); - _globalTable = _disk->loadTable("global"); + _globalFlagsNames = _disk->loadTable("global"); // If requested, load a savegame instead of showing the intro if (ConfMan.hasKey("save_slot")) { @@ -338,14 +338,10 @@ void Parallaction_ns::changeLocation(char *location) { strcpy(_saveData1, locname.location()); parseLocation(_saveData1); - _char._ani->_oldPos.x = -1000; - _char._ani->_oldPos.y = -1000; - - _char._ani->field_50 = 0; if (_location._startPosition.x != -1000) { - _char._ani->_left = _location._startPosition.x; - _char._ani->_top = _location._startPosition.y; - _char._ani->_frame = _location._startFrame; + _char._ani->setX(_location._startPosition.x); + _char._ani->setY(_location._startPosition.y); + _char._ani->setF(_location._startFrame); _location._startPosition.y = -1000; _location._startPosition.x = -1000; } @@ -458,7 +454,7 @@ void Parallaction_ns::cleanupGame() { // this code saves main character animation from being removed from the following code _location._animations.remove(_char._ani); _numLocations = 0; - _commandFlags = 0; + _globalFlags = 0; memset(_localFlags, 0, sizeof(_localFlags)); memset(_locationNames, 0, sizeof(_locationNames)); |