diff options
author | Nicola Mettifogo | 2007-11-01 14:47:33 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-11-01 14:47:33 +0000 |
commit | 7c8bf86a45ec09275484813803df5370d7867d20 (patch) | |
tree | 7594ef0909788034a5c656609b3c39f28ec345e1 /engines/parallaction/parallaction_ns.cpp | |
parent | 288f47e0341bd80302ef5585f6ef0da67d2738f5 (diff) | |
download | scummvm-rg350-7c8bf86a45ec09275484813803df5370d7867d20.tar.gz scummvm-rg350-7c8bf86a45ec09275484813803df5370d7867d20.tar.bz2 scummvm-rg350-7c8bf86a45ec09275484813803df5370d7867d20.zip |
More refactoring for gui code.
svn-id: r29355
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index f4eac6c037..500ba79de7 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -259,19 +259,16 @@ void Parallaction_ns::callFunction(uint index, void* parm) { int Parallaction_ns::go() { + _globalTable = _disk->loadTable("global"); + guiStart(); LocationName locname; locname.bind(_location._name); - _char.setName(locname.character()); - strcpy(_location._name, locname.location()); - - _globalTable = _disk->loadTable("global"); - - _engineFlags &= ~kEngineChangeLocation; - changeCharacter(_char.getName()); + changeCharacter(locname.character()); + strcpy(_location._name, locname.location()); strcpy(_saveData1, _location._name); parseLocation(_location._name); @@ -454,5 +451,4 @@ JobOpcode* Parallaction_ns::createJobOpcode(uint functionId, Job *job) { return new OpcodeImpl2<Parallaction_ns>(this, _jobsFn[functionId], job); } - } // namespace Parallaction |