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/scene.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/scene.h')
| -rw-r--r-- | engines/m4/scene.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/m4/scene.h b/engines/m4/scene.h index 9262a7c828..e0b28e6454 100644 --- a/engines/m4/scene.h +++ b/engines/m4/scene.h @@ -77,9 +77,6 @@ class Scene : public View { private: HotSpotList _sceneHotspots; protected: - int _currentScene; - int _previousScene; - int _nextScene; GameInterfaceView *_interfaceSurface; M4Surface *_backgroundSurface; M4Surface *_walkSurface; @@ -87,6 +84,10 @@ protected: RGBList *_interfacePal; SceneResources *_sceneResources; public: + int _currentScene; + int _previousScene; + int _nextScene; +public: Scene(MadsM4Engine *vm, SceneResources *res); virtual ~Scene(); |