diff options
| author | Torbjörn Andersson | 2003-11-16 14:18:29 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-11-16 14:18:29 +0000 |
| commit | fa2b8ba8de31f5659c675b507553a2b0a1ebd841 (patch) | |
| tree | 52841e821b3283a0ff9430cf8be0cc273208f6e6 /sword2/driver/_mouse.cpp | |
| parent | ab066c41e0a42320137bc6cb79d77720f932af0e (diff) | |
| download | scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.tar.gz scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.tar.bz2 scummvm-rg350-fa2b8ba8de31f5659c675b507553a2b0a1ebd841.zip | |
More cleanup. I've eliminated all the temporary global variables I've added
over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)
svn-id: r11309
Diffstat (limited to 'sword2/driver/_mouse.cpp')
| -rw-r--r-- | sword2/driver/_mouse.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp index bce554a3f3..d516c81093 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/driver/_mouse.cpp @@ -17,11 +17,7 @@ * $Header$ */ -#include "stdafx.h" -#include "sword2/driver/driver96.h" -#include "sword2/driver/d_draw.h" -#include "sword2/driver/render.h" -#include "sword2/driver/menu.h" +#include "common/stdafx.h" #include "sword2/sword2.h" namespace Sword2 { @@ -171,7 +167,7 @@ void Graphics::drawMouse(void) { if (_mouseAnim) decompressMouse(_mouseData, _mouseSprite, _mouseAnim->mousew, _mouseAnim->mouseh, mouse_width); - g_system->set_mouse_cursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y); + _vm->_system->set_mouse_cursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y); } /** @@ -225,12 +221,12 @@ int32 Graphics::setMouseAnim(uint8 *ma, int32 size, int32 mouseFlash) { animateMouse(); drawMouse(); - g_system->show_mouse(true); + _vm->_system->show_mouse(true); } else { if (_luggageAnim) drawMouse(); else - g_system->show_mouse(false); + _vm->_system->show_mouse(false); } return RD_OK; @@ -260,12 +256,12 @@ int32 Graphics::setLuggageAnim(uint8 *ma, int32 size) { animateMouse(); drawMouse(); - g_system->show_mouse(true); + _vm->_system->show_mouse(true); } else { if (_mouseAnim) drawMouse(); else - g_system->show_mouse(false); + _vm->_system->show_mouse(false); } return RD_OK; |