aboutsummaryrefslogtreecommitdiff
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
parent5e947dab38c1238b5ac03294cdafcea50a6cda1e (diff)
downloadscummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.tar.gz
scummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.tar.bz2
scummvm-rg350-985f24729ab1dcc827ea4082117ef5d92620fcc3.zip
forgot these...
svn-id: r12040
-rw-r--r--sword1/menu.cpp3
-rw-r--r--sword1/mouse.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/sword1/menu.cpp b/sword1/menu.cpp
index f085a54964..6d0b281fa5 100644
--- a/sword1/menu.cpp
+++ b/sword1/menu.cpp
@@ -299,6 +299,7 @@ void SwordMenu::fnStartMenu(void) {
SwordLogic::_scriptVars[OBJECT_HELD] = 0; // icon no longer selected
SwordLogic::_scriptVars[SECOND_ITEM] = 0; // second icon no longer selected (after using one on another)
SwordLogic::_scriptVars[MENU_LOOKING] = 0; // no longer 'looking at' an icon
+ _mouse->setLuggage(0, 0);
buildMenu();
_mouse->controlPanel(true); // so that the arrow cursor will be shown.
showMenu(MENU_TOP);
@@ -313,6 +314,7 @@ void SwordMenu::fnEndMenu(void) {
void SwordMenu::fnChooser(BsObject *compact) {
SwordLogic::_scriptVars[OBJECT_HELD] = 0;
+ _mouse->setLuggage(0, 0);
buildSubjects();
compact->o_logic = LOGIC_choose;
_mouse->controlPanel(true); // so the mouse cursor will be shown.
@@ -324,6 +326,7 @@ void SwordMenu::fnEndChooser(void) {
_subjectBarStatus = MENU_CLOSING;
_objectBarStatus = MENU_CLOSING;
_mouse->controlPanel(false);
+ _mouse->setLuggage(0, 0);
}
void SwordMenu::checkTopMenu(void) {
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;