diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/m4/m4.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/m4/m4.h')
| -rw-r--r-- | engines/m4/m4.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/m4/m4.h b/engines/m4/m4.h index 3174c886d5..b68f7248af 100644 --- a/engines/m4/m4.h +++ b/engines/m4/m4.h @@ -96,10 +96,10 @@ class Animation; enum M4GameType { GType_Riddle = 1, - GType_Burger, - GType_RexNebular, - GType_DragonSphere, - GType_Phantom + GType_Burger = 2, + GType_RexNebular = 3, + GType_DragonSphere = 4, + GType_Phantom = 5 }; enum Features { @@ -224,8 +224,10 @@ public: MadsGlobals *globals() { return (MadsGlobals *)_globals; } MadsScene *scene() { return (MadsScene *)_scene; } void startScene(int sceneNum) { - if (!_scene) + if (!_scene) { _scene = new MadsScene(this); + ((MadsScene *)_scene)->initialise(); + } _scene->show(); _scene->loadScene(101); } |