aboutsummaryrefslogtreecommitdiff
path: root/sword1/mouse.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-12-30 21:48:10 +0000
committerRobert Göffringmann2003-12-30 21:48:10 +0000
commit985f24729ab1dcc827ea4082117ef5d92620fcc3 (patch)
tree36125ebb53420a982e5b558c393ba17fc07f4223 /sword1/mouse.cpp
parent5e947dab38c1238b5ac03294cdafcea50a6cda1e (diff)
downloadscummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.tar.gz
scummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.tar.bz2
scummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.zip
forgot these...
svn-id: r12040
Diffstat (limited to 'sword1/mouse.cpp')
-rw-r--r--sword1/mouse.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp
index 5412dd1ebe..035ead96a9 100644
--- a/sword1/mouse.cpp
+++ b/sword1/mouse.cpp
@@ -243,7 +243,7 @@ void SwordMouse::setLuggage(uint32 resId, uint32 rate) {
}
void SwordMouse::animate(void) {
- if ((SwordLogic::_scriptVars[MOUSE_STATUS] == 1) || _mouseOverride) {
+ if ((SwordLogic::_scriptVars[MOUSE_STATUS] == 1) || (_mouseOverride && _currentPtr)) {
_frame = (_frame + 1) % _currentPtr->numFrames;
uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr);
ptrData += _frame * _currentPtr->sizeX * _currentPtr->sizeY;