diff options
| author | Johannes Schickel | 2007-07-29 16:35:15 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-07-29 16:35:15 +0000 |
| commit | 5354f3b1d0a389e316437ca76193e7a5782465ae (patch) | |
| tree | 5b0aa1e49f83a07a8f6fbfb7e322426295e002d0 /engines/kyra | |
| parent | 1140fca82e79121ad2a154dc98b1637c8d56d55d (diff) | |
| download | scummvm-rg350-5354f3b1d0a389e316437ca76193e7a5782465ae.tar.gz scummvm-rg350-5354f3b1d0a389e316437ca76193e7a5782465ae.tar.bz2 scummvm-rg350-5354f3b1d0a389e316437ca76193e7a5782465ae.zip | |
- fixes some warnings
- enables Kyrandia 2 main menu again
svn-id: r28298
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 8 | ||||
| -rw-r--r-- | engines/kyra/util.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 7a9d631c25..3e08ea43c6 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -137,7 +137,7 @@ int KyraEngine_v2::go() { } void KyraEngine_v2::mainMenu() { - /*bool running = true; + bool running = true; while (running && !_quitFlag) { seq_playSequences(kSequenceTitle); @@ -145,11 +145,11 @@ void KyraEngine_v2::mainMenu() { switch (gui_handleMainMenu()) { case 0: - _screen->showMouse();*/ + _screen->showMouse(); startup(); runLoop(); cleanup(); - /*running = false; + running = false; break; case 1: seq_playSequences(kSequenceOverview, kSequenceZanFaun); @@ -163,7 +163,7 @@ void KyraEngine_v2::mainMenu() { break; } _screen->hideMouse(); - }*/ + } } void KyraEngine_v2::startup() { diff --git a/engines/kyra/util.h b/engines/kyra/util.h index edb2ca454a..98692df015 100644 --- a/engines/kyra/util.h +++ b/engines/kyra/util.h @@ -32,6 +32,8 @@ namespace Kyra { template<class Arg, class Res> struct Functor1 : public Common::UnaryFunction<Arg, Res> { + virtual ~Functor1() {} + virtual operator bool() const = 0; virtual Res operator()(Arg) const = 0; }; |