aboutsummaryrefslogtreecommitdiff
path: root/saga/script.cpp
diff options
context:
space:
mode:
authorAndrew Kurushin2005-05-15 17:45:59 +0000
committerAndrew Kurushin2005-05-15 17:45:59 +0000
commit1d31cd12233d8a98ea9288147cde946d3884c7c0 (patch)
treedbd45e4e5df6fabda14cc0166fa17403c37094a0 /saga/script.cpp
parent2425e657a2dc1a22b3e0502b37fd9e584e3abf51 (diff)
downloadscummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.tar.gz
scummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.tar.bz2
scummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.zip
fixed give verb
fixed occasional verbs redraw svn-id: r18113
Diffstat (limited to 'saga/script.cpp')
-rw-r--r--saga/script.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/saga/script.cpp b/saga/script.cpp
index 47823abf45..77bac9b850 100644
--- a/saga/script.cpp
+++ b/saga/script.cpp
@@ -685,8 +685,7 @@ void Script::whichObject(const Point& mousePoint) {
_leftButtonVerb = _currentVerb;
newRightButtonVerb = kVerbNone;
- if (_vm->_actor->_protagonist->currentAction == kActionWalkDir) {
- } else {
+ if (_vm->_actor->_protagonist->currentAction != kActionWalkDir) {
if (_vm->getSceneHeight() >= mousePoint.y) {
newObjectId = _vm->_actor->hitTest(mousePoint, true);
@@ -755,7 +754,7 @@ void Script::whichObject(const Point& mousePoint) {
newRightButtonVerb = kVerbNone;
}
- if ((_currentVerb == kVerbTalkTo) || ((_currentVerb == kVerbGive) && !_firstObjectSet)) {
+ if ((_currentVerb == kVerbTalkTo) || ((_currentVerb == kVerbGive) && _firstObjectSet)) {
objectId = ID_NOTHING;
newObjectId = ID_NOTHING;
}
@@ -766,7 +765,7 @@ void Script::whichObject(const Point& mousePoint) {
}
}
} else {
- if ((_currentVerb == kVerbTalkTo) || ((_currentVerb == kVerbGive) && !_firstObjectSet)) {
+ if ((_currentVerb == kVerbTalkTo) || ((_currentVerb == kVerbGive) && _firstObjectSet)) {
// no way
} else {
panelButton = _vm->_interface->inventoryHitTest(mousePoint);