[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.74,1.75 mouse.cpp,1.4,1.5 mouse.h,1.4,1.5
Joost Peters
joostp at users.sourceforge.net
Sun Jun 1 06:21:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv22436/sky
Modified Files:
logic.cpp mouse.cpp mouse.h
Log Message:
add fnNormalMouse()
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- logic.cpp 1 Jun 2003 13:12:10 -0000 1.74
+++ logic.cpp 1 Jun 2003 13:20:54 -0000 1.75
@@ -1342,7 +1342,7 @@
}
bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnNormalMouse");
+ return _skyMouse->fnNormalMouse();
}
bool SkyLogic::fnBlankMouse(uint32 a, uint32 b, uint32 c) {
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse.cpp 1 Jun 2003 13:07:20 -0000 1.4
+++ mouse.cpp 1 Jun 2003 13:20:55 -0000 1.5
@@ -103,51 +103,47 @@
}
SkyMouse::~SkyMouse( ){
-
free (_miceData);
free (_savedData);
free (_objectMouseData);
}
void SkyMouse::replaceMouseCursors(uint16 fileNo) {
-
_skyDisk->loadFile(fileNo, _objectMouseData);
}
bool SkyMouse::fnBlankMouse(void) {
-
_mouseXOff = 0; //re-align mouse
spriteMouse(MOUSE_BLANK, 0, 0);
return true;
}
bool SkyMouse::fnDiskMouse(void) {
-
//turn the mouse into a disk mouse
spriteMouse(MOUSE_DISK, 11, 11);
return true; //don't quit from the interpreter
-
}
-void SkyMouse::lockMouse(void) {
+bool SkyMouse::fnNormalMouse(void) {
+ spriteMouse(MOUSE_NORMAL, 0, 0);
+ return true;
+}
+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();
@@ -155,7 +151,6 @@
}
void SkyMouse::spriteMouse(uint16 frameNum, uint16 mouseX, uint16 mouseY) {
-
//_mouseFlag |= MF_IN_INT;
_mouseType2 = frameNum;
_mouseOffsetX = mouseX;
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse.h 1 Jun 2003 12:49:39 -0000 1.4
+++ mouse.h 1 Jun 2003 13:20:55 -0000 1.5
@@ -36,6 +36,7 @@
void replaceMouseCursors(uint16 fileNo);
bool fnBlankMouse(void);
bool fnDiskMouse(void);
+ bool fnNormalMouse(void);
void lockMouse(void);
void unlockMouse(void);
void restoreMouseData(uint16 frameNum);
More information about the Scummvm-git-logs
mailing list