diff options
| author | Nicola Mettifogo | 2007-11-01 14:08:55 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-11-01 14:08:55 +0000 |
| commit | 288f47e0341bd80302ef5585f6ef0da67d2738f5 (patch) | |
| tree | 61532f3cef8f9ae7e517eb136599e3d8ec9923d1 /engines/parallaction/parallaction_ns.cpp | |
| parent | 512e57c69017578e9cbf2d623467933d93cf4aaf (diff) | |
| download | scummvm-rg350-288f47e0341bd80302ef5585f6ef0da67d2738f5.tar.gz scummvm-rg350-288f47e0341bd80302ef5585f6ef0da67d2738f5.tar.bz2 scummvm-rg350-288f47e0341bd80302ef5585f6ef0da67d2738f5.zip | |
* Merged object Menu into Parallaction_ns.
* Some preliminary refactoring of ex-menu code.
svn-id: r29354
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index fd717a11b6..f4eac6c037 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -29,7 +29,6 @@ #include "parallaction/parallaction.h" #include "parallaction/sound.h" -#include "parallaction/menu.h" namespace Parallaction { @@ -260,8 +259,7 @@ void Parallaction_ns::callFunction(uint index, void* parm) { int Parallaction_ns::go() { - _menu = new Menu(this); - _menu->start(); + guiStart(); LocationName locname; locname.bind(_location._name); @@ -287,8 +285,6 @@ int Parallaction_ns::go() { runGame(); - delete _menu; - return 0; } |