libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 16:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

forgot these...

Browse Source 
svn-id: r12040
This commit is contained in:
Robert Göffringmann 2003-12-30 21:48:10 +00:00
parent 5e947dab38
commit 985f24729a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sword1/menu.cpp
View File

@ -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) {

2
sword1/mouse.cpp
View File

@ -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;