diff options
| author | Henry Bush | 2009-01-08 23:06:08 +0000 |
|---|---|---|
| committer | Henry Bush | 2009-01-08 23:06:08 +0000 |
| commit | 9446bfa50316e3d1253a1d56f1f996f2ede3fb75 (patch) | |
| tree | 75cda534848f50f71c1bde85269d09de1a3dafc0 /engines/groovie/groovie.cpp | |
| parent | 8eb7d55eca5aaf1acb005654c28b88b1e14111b2 (diff) | |
| download | scummvm-rg350-9446bfa50316e3d1253a1d56f1f996f2ede3fb75.tar.gz scummvm-rg350-9446bfa50316e3d1253a1d56f1f996f2ede3fb75.tar.bz2 scummvm-rg350-9446bfa50316e3d1253a1d56f1f996f2ede3fb75.zip | |
T7G: Stage one of move to ScummVM's CursorMan: rename groovie one so it doesn't have same name
svn-id: r35793
Diffstat (limited to 'engines/groovie/groovie.cpp')
| -rw-r--r-- | engines/groovie/groovie.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index c0e4428a88..34d283a967 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -36,7 +36,7 @@ namespace Groovie { GroovieEngine::GroovieEngine(OSystem *syst, GroovieGameDescription *gd) : Engine(syst), _gameDescription(gd), _debugger(NULL), _script(this), - _resMan(NULL), _cursorMan(NULL), _videoPlayer(NULL), _musicPlayer(NULL), + _resMan(NULL), _grvCursorMan(NULL), _videoPlayer(NULL), _musicPlayer(NULL), _graphicsMan(NULL), _waitingForInput(false) { // Adding the default directories @@ -62,7 +62,7 @@ GroovieEngine::~GroovieEngine() { // Delete the remaining objects delete _debugger; delete _resMan; - delete _cursorMan; + delete _grvCursorMan; delete _videoPlayer; delete _musicPlayer; delete _graphicsMan; @@ -83,12 +83,12 @@ Common::Error GroovieEngine::init() { switch (_gameDescription->version) { case kGroovieT7G: _resMan = new ResMan_t7g(); - _cursorMan = new CursorMan_t7g(_system); + _grvCursorMan = new GrvCursorMan_t7g(_system); _videoPlayer = new VDXPlayer(this); break; case kGroovieV2: _resMan = new ResMan_v2(); - _cursorMan = new CursorMan_v2(_system); + _grvCursorMan = new GrvCursorMan_v2(_system); _videoPlayer = new ROQPlayer(this); break; } @@ -227,7 +227,7 @@ Common::Error GroovieEngine::go() { if (_waitingForInput) { // Still waiting for input, just update the mouse, game timer and then wait a bit more - _cursorMan->animate(); + _grvCursorMan->animate(); _system->updateScreen(); tmr++; // Wait a little bit between increments. While mouse is moving, this triggers |