ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TWP: Fix give minimum distance

Browse Source
This commit is contained in:
scemino authored and Eugene Sandulenko committed 2024-03-07 20:08:26 +01:00
1 parent eb04a3a159
commit 7dd6c4ba62
1 file changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files
engines/twp/object.cpp
+11 -2
View File
@@ -27,10 +27,19 @@
#include "twp/squtil.h"
#define MIN_TALK_DIST 60
#define MIN_GIVE_DIST 30
#define MIN_USE_DIST 15
namespace Twp {
static float getVerbDist(VerbId verb) {
if(verb.id == VERB_TALKTO)
return MIN_TALK_DIST;
if(verb.id == VERB_GIVE)
return MIN_GIVE_DIST;
return MIN_USE_DIST;
}
enum class BlinkState {
Closed,
Open
@@ -736,7 +745,7 @@ void Object::execVerb(Common::SharedPtr<Object> obj) {
}
// Did we get close enough?
float dist = distance(obj->getUsePos(), noun1->getUsePos());
float min_dist = verb.id == VERB_TALKTO ? MIN_TALK_DIST : MIN_USE_DIST;
float min_dist = getVerbDist(verb);
debugC(kDebugGame, "actorArrived: noun1 min_dist: %f > %f (actor: {self.getUsePos}, obj: {noun1.getUsePos}) ?", dist, min_dist);
if (!verbNotClose(verb) && (dist > min_dist)) {
cantReach(noun1, noun2);
@@ -754,7 +763,7 @@ void Object::execVerb(Common::SharedPtr<Object> obj) {
return;
}
float dist = distance(obj->getUsePos(), noun2->getUsePos());
float min_dist = verb.id == VERB_TALKTO ? MIN_TALK_DIST : MIN_USE_DIST;
float min_dist = getVerbDist(verb);
debugC(kDebugGame, "actorArrived: noun2 min_dist: %f > %f ?", dist, min_dist);
if (dist > min_dist) {
cantReach(noun1, noun2);