diff options
Diffstat (limited to 'sky')
-rw-r--r-- | sky/mouse.cpp | 12 | ||||
-rw-r--r-- | sky/mouse.h | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sky/mouse.cpp b/sky/mouse.cpp index 0b21d93fe4..99ebc98eb3 100644 --- a/sky/mouse.cpp +++ b/sky/mouse.cpp @@ -27,7 +27,6 @@ #define NO_LINC_OBJECTS 21 uint32 _mouseObjectList[] = { - 65, 9, 66, @@ -85,6 +84,7 @@ SkyMouse::SkyMouse(SkyDisk *skyDisk) { _mouseHeight = 6; _maskWidth = 6; _maskHeight = 6; + _miceData = _skyDisk->loadFile(MICE_FILE, NULL); _mouseData2 = _miceData; @@ -98,12 +98,11 @@ SkyMouse::SkyMouse(SkyDisk *skyDisk) { _objectMouseData = _skyDisk->loadFile(MICE_FILE + 1, NULL); _mouseWidth = 1; _mouseHeight = 1; - //_systemFlags |= SF_MOUSE;; - } SkyMouse::~SkyMouse( ){ + free (_miceData); free (_savedData); free (_objectMouseData); @@ -112,7 +111,6 @@ SkyMouse::~SkyMouse( ){ void SkyMouse::replaceMouseCursors(uint16 fileNo) { _skyDisk->loadFile(fileNo, _objectMouseData); - } uint32 SkyMouse::fnBlankMouse(void) { @@ -121,28 +119,27 @@ uint32 SkyMouse::fnBlankMouse(void) { spriteMouse(MOUSE_BLANK, 0, 0); return 1; - } void SkyMouse::lockMouse(void) { _lockMouseX = _aMouseX; _lockMouseY = _aMouseY; - } void SkyMouse::unlockMouse(void) { _aMouseX = _lockMouseX; _aMouseY = _lockMouseY; - } void SkyMouse::restoreMouseData(uint16 frameNum) { + warning("Stub: SkyMouse::restoreMouseData"); } void SkyMouse::drawNewMouse() { + warning("Stub: SkyMouse::drawNewMouse"); //calculateMouseValues(); //saveMouseData(); @@ -157,7 +154,6 @@ void SkyMouse::spriteMouse(uint16 frameNum, uint16 mouseX, uint16 mouseY) { _mouseOffsetY = mouseY; restoreMouseData(frameNum); - byte *mouseData = _miceData; uint32 pos = ((struct dataFileHeader *)mouseData)->s_sp_size * ((struct dataFileHeader *)mouseData)->s_sp_size; pos += sizeof(struct dataFileHeader); diff --git a/sky/mouse.h b/sky/mouse.h index 5d971942c8..7b2b91cb1b 100644 --- a/sky/mouse.h +++ b/sky/mouse.h @@ -29,6 +29,7 @@ class SkyMouse { public: + SkyMouse(SkyDisk *skyDisk); ~SkyMouse(void); @@ -40,8 +41,8 @@ public: void drawNewMouse(void); void spriteMouse(uint16 frameNum, uint16 mouseX, uint16 mouseY); - protected: + uint16 _aMouseX; //actual mouse coordinates uint16 _aMouseY; @@ -69,16 +70,15 @@ protected: byte *_miceData; //address of mouse sprites byte *_objectMouseData; //address of object mouse sprites - + uint16 _tMouseX; uint16 _tMouseY; uint16 _mouseXOff; - + static uint32 _mouseObjectList[]; - - SkyDisk *_skyDisk; + SkyDisk *_skyDisk; }; #endif //SKYMOUSE_H |