From 985f24729ab1dcc827ea4082117ef5d92620fcc3 Mon Sep 17 00:00:00 2001
From: Robert Göffringmann
Date: Tue, 30 Dec 2003 21:48:10 +0000
Subject: forgot these...

svn-id: r12040
---
 sword1/mouse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sword1/mouse.cpp')

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;
-- 
cgit v1.2.3