aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorJoost Peters2003-07-01 23:44:31 +0000
committerJoost Peters2003-07-01 23:44:31 +0000
commitcff9817d443e59ff2ab4dc696793a4b17b274eec (patch)
treefc1a9d7c26b826a3e3fe414efa4b7e137e217007 /sky
parentc66457664ed3a235d0dba9a8982055147b4945b4 (diff)
downloadscummvm-rg350-cff9817d443e59ff2ab4dc696793a4b17b274eec.tar.gz
scummvm-rg350-cff9817d443e59ff2ab4dc696793a4b17b274eec.tar.bz2
scummvm-rg350-cff9817d443e59ff2ab4dc696793a4b17b274eec.zip
removed unnecessary variables
svn-id: r8694
Diffstat (limited to 'sky')
-rw-r--r--sky/mouse.cpp7
-rw-r--r--sky/mouse.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/sky/mouse.cpp b/sky/mouse.cpp
index 7461fca586..99a81f90d7 100644
--- a/sky/mouse.cpp
+++ b/sky/mouse.cpp
@@ -91,10 +91,6 @@ SkyMouse::SkyMouse(OSystem *system, SkyDisk *skyDisk) {
fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
_mouseData2 = _miceData;
- uint16 width = FROM_LE_16(((struct dataFileHeader *)_miceData)->s_width);
- uint16 height = FROM_LE_16(((struct dataFileHeader *)_miceData)->s_height);
- _savedData = (byte *)malloc((width * height) + sizeof(struct dataFileHeader));
-
//load in the object mouse file
_objectMouseData = _skyDisk->loadFile(MICE_FILE + 1, NULL);
fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
@@ -105,7 +101,6 @@ SkyMouse::SkyMouse(OSystem *system, SkyDisk *skyDisk) {
SkyMouse::~SkyMouse( ){
free (_miceData);
- free (_savedData);
free (_objectMouseData);
}
@@ -208,7 +203,7 @@ void SkyMouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
_mouseHeight = ((struct dataFileHeader *)mouseData)->s_height;
//_system->set_mouse_cursor(_mouseData2, _mouseWidth, _mouseHeight, mouseX, mouseY);
- // there's something wrong about the mouse's hotspot. using 0/0 works fine.
+ // there's something wrong about the mouse's hotspot. using 0/0 works fine. (but the cursor is still a couple of pixels off)
_system->set_mouse_cursor(_mouseData2, _mouseWidth, _mouseHeight, 0, 0);
if (frameNum == MOUSE_BLANK) _system->show_mouse(false);
else _system->show_mouse(true);
diff --git a/sky/mouse.h b/sky/mouse.h
index 35a733efa1..16f44e5b2d 100644
--- a/sky/mouse.h
+++ b/sky/mouse.h
@@ -84,8 +84,6 @@ protected:
uint16 _maskWidth; //width on screen
uint16 _maskHeight; //height on screen
- byte *_savedData; //place for saved data
-
uint32 _mouseFlag; //bit 0 set when in handler
//bit 1 set when screen data has been saved
//bit 2 set when we don't want to show mouse