aboutsummaryrefslogtreecommitdiff
path: root/saga/interface.cpp
diff options
context:
space:
mode:
authorAndrew Kurushin2005-01-04 16:10:43 +0000
committerAndrew Kurushin2005-01-04 16:10:43 +0000
commite733d05fefa929f131cd39aed4b1eb935dac40ef (patch)
tree36743fbcc72fa8625aa6ac271966a13471c4107b /saga/interface.cpp
parent6d966a6e17900a865b3617515638f55f67031c4f (diff)
downloadscummvm-rg350-e733d05fefa929f131cd39aed4b1eb935dac40ef.tar.gz
scummvm-rg350-e733d05fefa929f131cd39aed4b1eb935dac40ef.tar.bz2
scummvm-rg350-e733d05fefa929f131cd39aed4b1eb935dac40ef.zip
- added setup of followers position at start of scene
svn-id: r16423
Diffstat (limited to 'saga/interface.cpp')
-rw-r--r--saga/interface.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp
index 77fa34b6fe..ae4ba581da 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -555,28 +555,27 @@ int Interface::handleCommandUpdate(SURFACE *ds, const Point& imousePt) {
}
int Interface::handlePlayfieldClick(SURFACE *ds, const Point& imousePt) {
- return SUCCESS;
-/*
+// return SUCCESS;
+
int objectNum;
uint16 object_flags = 0;
int script_num;
- Point iactor_pt;
+ ActorLocation location;
objectNum = _vm->_scene->_objectMap->hitTest(imousePt);
if (objectNum == -1) {
// Player clicked on empty spot - walk here regardless of verb
- _vm->_actor->StoA(iactor_pt, imousePt);
- error("!");
+ location.fromScreenPoint(imousePt);
- _vm->_actor->walkTo(1, &iactor_pt, 0, NULL);
+ _vm->_actor->actorWalkTo(ID_PROTAG, location);
return SUCCESS;
}
object_flags = _vm->_scene->_objectMap->getFlags(objectNum);
- if (object_flags & OBJECT_EXIT) { // FIXME. This is wrong
+ if (object_flags & kHitZoneExit) { // FIXME. This is wrong
if ((script_num = _vm->_scene->_objectMap->getEPNum(objectNum)) != -1) {
// Set active verb in script module
_vm->_script->putWord(4, 4, I_VerbData[_activeVerb].s_verb);
@@ -588,13 +587,12 @@ int Interface::handlePlayfieldClick(SURFACE *ds, const Point& imousePt) {
}
} else {
// Not a normal scene object - walk to it as if it weren't there
- _vm->_actor->StoA(iactor_pt, imousePt);
-// _vm->_actor->walkTo(1, &iactor_pt, 0, NULL);
- error("!");
+ location.fromScreenPoint(imousePt);
+ _vm->_actor->actorWalkTo(ID_PROTAG, location);
}
- return SUCCESS;*/
+ return SUCCESS;
}
int Interface::handlePlayfieldUpdate(SURFACE *ds, const Point& imousePt) {