diff options
author | Jordi Vilalta Prat | 2009-01-14 02:08:44 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2009-01-14 02:08:44 +0000 |
commit | be346a6b5f1a02bea8f8079199dddbef9d05b80e (patch) | |
tree | 9f46cbc28d43a774c5803e84e311384fd9cdccab /engines | |
parent | 215af6f3b41a0460be6333aa1a4be50e8033fa63 (diff) | |
download | scummvm-rg350-be346a6b5f1a02bea8f8079199dddbef9d05b80e.tar.gz scummvm-rg350-be346a6b5f1a02bea8f8079199dddbef9d05b80e.tar.bz2 scummvm-rg350-be346a6b5f1a02bea8f8079199dddbef9d05b80e.zip |
- Initialize the current cursor to an invalid one (this removes a glitch when loading from the launcher)
- Removed the _syst attribute in Cursor_t7g
svn-id: r35856
Diffstat (limited to 'engines')
-rw-r--r-- | engines/groovie/cursor.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index ac2287baf9..8aa514a6b1 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -33,7 +33,7 @@ namespace Groovie { // Cursor Manager GrvCursorMan::GrvCursorMan(OSystem *system) : - _syst(system), _lastTime(0), _current(0), _cursor(NULL) { + _syst(system), _lastTime(0), _current(-1), _cursor(NULL) { } GrvCursorMan::~GrvCursorMan() { @@ -80,19 +80,18 @@ void GrvCursorMan::animate() { class Cursor_t7g : public Cursor { public: - Cursor_t7g(OSystem *system, uint8 *img, uint8 *pal); + Cursor_t7g(uint8 *img, uint8 *pal); void enable(); void showFrame(uint16 frame); private: - OSystem *_syst; byte *_img; byte *_pal; }; -Cursor_t7g::Cursor_t7g(OSystem *system, uint8 *img, uint8 *pal) : - _syst(system), _pal(pal) { +Cursor_t7g::Cursor_t7g(uint8 *img, uint8 *pal) : + _pal(pal) { _width = img[0]; _height = img[1]; @@ -157,7 +156,7 @@ GrvCursorMan_t7g::GrvCursorMan_t7g(OSystem *system) : // Build the cursors for (uint cursor = 0; cursor < NUM_STYLES; cursor++) { - Cursor *s = new Cursor_t7g(_syst, _images[_cursorImg[cursor]], _palettes[_cursorPal[cursor]]); + Cursor *s = new Cursor_t7g(_images[_cursorImg[cursor]], _palettes[_cursorPal[cursor]]); _cursors.push_back(s); } |