[Scummvm-cvs-logs] CVS: scummvm/sword1 mouse.cpp,1.6,1.7 mouse.h,1.3,1.4
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Thu Dec 18 06:42:15 CET 2003
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv21839/sword1
Modified Files:
mouse.cpp mouse.h
Log Message:
fix mouse cursor animations
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mouse.cpp 17 Dec 2003 07:33:00 -0000 1.6
+++ mouse.cpp 18 Dec 2003 14:38:17 -0000 1.7
@@ -184,12 +184,9 @@
_resMan->resClose(_specialPtrId);
_specialPtrId = 0;
}
- _rate = rate;
- _rateCnt = 1;
_frame = 0;
if (resId == 0) {
- _rateCnt = 0;
_system->set_mouse_cursor(NULL, 0, 0, 0, 0);
_system->show_mouse(false);
} else {
@@ -207,18 +204,15 @@
void SwordMouse::animate(void) {
MousePtr *currentPtr;
- if (_rateCnt && ((_mouseStatus == 1) || _menuStatus)) {
+ if ((_mouseStatus == 1) || _menuStatus) {
if (_specialPtrId)
currentPtr = _specialPtr;
else
currentPtr = _pointers[_currentPtrId];
- _rateCnt--;
- if (!_rateCnt) {
- _rateCnt = _rate;
- _frame = (_frame + 1) % currentPtr->numFrames;
- uint16 size = currentPtr->sizeX * currentPtr->sizeY;
- _system->set_mouse_cursor(currentPtr->data + 0x30 + _frame * size, currentPtr->sizeX, currentPtr->sizeY, currentPtr->hotSpotX, currentPtr->hotSpotY);
- }
+
+ _frame = (_frame + 1) % currentPtr->numFrames;
+ uint16 size = currentPtr->sizeX * currentPtr->sizeY;
+ _system->set_mouse_cursor(currentPtr->data + 0x30 + _frame * size, currentPtr->sizeX, currentPtr->sizeY, currentPtr->hotSpotX, currentPtr->hotSpotY);
}
}
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mouse.h 17 Dec 2003 05:16:37 -0000 1.3
+++ mouse.h 18 Dec 2003 14:38:17 -0000 1.4
@@ -85,7 +85,7 @@
void setMenuStatus(uint8 status);
private:
MousePtr *_pointers[17];
- uint32 _currentPtrId, _rate, _rateCnt, _frame;
+ uint32 _currentPtrId, _frame;
OSystem *_system;
SwordLogic *_logic;
SwordMenu *_menu;
More information about the Scummvm-git-logs
mailing list