aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/m4.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-06-14 05:27:54 +0000
committerPaul Gilbert2010-06-14 05:27:54 +0000
commit6fb462e6b05c5ead3fefe97e18d31f4835d5e321 (patch)
tree5f0c9833b33af9cef0a837998f5d1ce41bf7045b /engines/m4/m4.h
parent466a151744618f89d6a0b53d23189af048d88831 (diff)
downloadscummvm-rg350-6fb462e6b05c5ead3fefe97e18d31f4835d5e321.tar.gz
scummvm-rg350-6fb462e6b05c5ead3fefe97e18d31f4835d5e321.tar.bz2
scummvm-rg350-6fb462e6b05c5ead3fefe97e18d31f4835d5e321.zip
Further memory leak fixes reported by Valgrind
svn-id: r49644
Diffstat (limited to 'engines/m4/m4.h')
-rw-r--r--engines/m4/m4.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 9937107668..f5ddcc28be 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -29,6 +29,7 @@
#include "common/scummsys.h"
#include "common/util.h"
#include "common/random.h"
+#include "sound/mididrv.h"
#include "engines/engine.h"
@@ -123,7 +124,7 @@ enum {
struct M4GameDescription;
-#define GAME_FRAME_DELAY 50
+#define GAME_FRAME_DELAY 20
#define VALIDATE_MADS assert(!_vm->isM4())
@@ -144,6 +145,7 @@ protected:
void shutdown();
+ MidiDriver *_driver;
MidiPlayer *_midi;
public:
@@ -219,6 +221,12 @@ public:
MadsGlobals *globals() { return (MadsGlobals *)_globals; }
MadsScene *scene() { return (MadsScene *)_scene; }
+ void startScene(int sceneNum) {
+ if (!_scene)
+ _scene = new MadsScene(this);
+ _scene->show();
+ _scene->loadScene(101);
+ }
};
class M4Engine : public MadsM4Engine {