aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/mads/action.cpp18
-rw-r--r--engines/mads/action.h4
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index e227d7c700..a84c329dd0 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -53,7 +53,7 @@ void MADSAction::clear() {
_recentCommandSource = 0;
_articleNumber = 0;
_lookFlag = false;
- _v86F4A = 0;
+ _pointEstablished = 0;
_selectedRow = -1;
_hotspotId = -1;
_secondObject = -1;
@@ -74,11 +74,11 @@ void MADSAction::appendVocab(int vocabId, bool capitalise) {
_statusText += " ";
}
-void MADSAction::checkCustomDest(int v) {
+void MADSAction::startWalkingDirectly(int walkType) {
Scene &scene = _vm->_game->_scene;
Player &player = _vm->_game->_player;
- if (_v86F4A && (v == -3 || _savedFields._command < 0)) {
+ if (_pointEstablished && (walkType == -3 || _savedFields._command < 0)) {
player._needToWalk = true;
player._prepareWalkPos = scene._customDest;
}
@@ -304,7 +304,7 @@ void MADSAction::startAction() {
if (hotspotId >= (int)hotspots.size()) {
DynamicHotspot &hs = dynHotspots[hotspotId - hotspots.size()];
if ((hs._feetPos.x == -1) || (hs._feetPos.x == -3)) {
- checkCustomDest(hs._feetPos.x);
+ startWalkingDirectly(hs._feetPos.x);
} else if (hs._feetPos.x == 0) {
player._prepareWalkFacing = hs._facing;
} else if (_savedFields._commandSource == ACTIONMODE_NONE || hs._cursor >= CURSOR_WAIT) {
@@ -321,7 +321,7 @@ void MADSAction::startAction() {
Hotspot &hs = hotspots[hotspotId];
if (hs._feetPos.x == -1 || hs._feetPos.x == -3) {
- checkCustomDest(hs._feetPos.x);
+ startWalkingDirectly(hs._feetPos.x);
} else if (hs._feetPos.x >= 0) {
if (_savedFields._commandSource == ACTIONMODE_NONE || hs._cursor < CURSOR_WAIT) {
player._needToWalk = true;
@@ -561,7 +561,7 @@ void MADSAction::leftClick() {
if (_vm->_events->currentPos().y < MADS_SCENE_HEIGHT) {
scene._customDest = _vm->_events->currentPos() + scene._posAdjust;
_selectedAction = -1;
- _v86F4A = true;
+ _pointEstablished = true;
}
break;
@@ -591,7 +591,7 @@ void MADSAction::leftClick() {
if (userInterface._category == CAT_HOTSPOT) {
scene._customDest = _vm->_events->mousePos() + scene._posAdjust;
- _v86F4A = true;
+ _pointEstablished = true;
}
}
break;
@@ -609,9 +609,9 @@ void MADSAction::leftClick() {
_selectedAction = -1;
if (userInterface._category == CAT_HOTSPOT) {
- if (!_v86F4A) {
+ if (!_pointEstablished) {
scene._customDest = _vm->_events->mousePos() + scene._posAdjust;
- _v86F4A = true;
+ _pointEstablished = true;
}
}
}
diff --git a/engines/mads/action.h b/engines/mads/action.h
index 4b51ec9b71..343f9154da 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -88,7 +88,7 @@ private:
void appendVocab(int vocabId, bool capitalise = false);
- void checkCustomDest(int v);
+ void startWalkingDirectly(int v);
public:
ActionDetails _action, _activeAction;
int8 _flags1, _flags2;
@@ -108,7 +108,7 @@ public:
int16 _secondObject;
int16 _secondObjectSource;
int16 _recentCommandSource;
- bool _v86F4A;
+ bool _pointEstablished;
int16 _recentCommand;
InterAwaiting _interAwaiting;
bool _inProgress;