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/callables_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/callables_ns.cpp')
| -rw-r--r-- | engines/parallaction/callables_ns.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index c6c274b96c..c2ace3e3f0 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -31,7 +31,6 @@ #include "graphics/primitives.h" // for Graphics::drawLine #include "parallaction/parallaction.h" -#include "parallaction/menu.h" #include "parallaction/sound.h" @@ -435,7 +434,7 @@ void Parallaction_ns::_c_finito(void *parm) { _gfx->updateScreen(); waitUntilLeftClick(); - _menu->selectCharacter(); + guiSelectCharacter(); } // this code saves main character animation from being removed from the following code @@ -548,7 +547,7 @@ void Parallaction_ns::_c_endIntro(void *parm) { waitUntilLeftClick(); _engineFlags &= ~kEngineBlockInput; - _menu->selectCharacter(); + guiSelectCharacter(); } else { waitUntilLeftClick(); } |