libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 19:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Cleanup and formatting

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-07-06 21:39:48 +02:00
parent 55a9867755
commit 173cf9ee28
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/saga2/contain.cpp
View File

@ -44,14 +44,12 @@
namespace Saga2 {
// debug
uint8 weight = 0;
uint8 encum = 0;
enum {
kMaxOpenDistance = 32
};
const int maxOpenDistance = 32;
// selector image pointer
static void *selImage;
static void *selImage;
/* ===================================================================== *
Imports
@ -1570,8 +1568,10 @@ bool ContainerNode::isAccessable(ObjectID enactor) {
holder = obj->possessor();
if (holder != Nothing || isActor(object)) {
// "Reach" for other players is further than for other objects
if (holder != a->thisID() && dist > 96) return false;
} else if (dist > maxOpenDistance) return false;
if (holder != a->thisID() && dist > 96)
return false;
} else if (dist > kMaxOpenDistance)
return false;
return true;
}
@ -1624,7 +1624,7 @@ void ContainerList::doDeferredActions(void) {
// from the protagonist, then quietly close the object.
GameObject *obj = GameObject::objectAddress(n->object);
if (obj->world() != world
|| (obj->getWorldLocation() - tp).quickHDistance() > maxOpenDistance) {
|| (obj->getWorldLocation() - tp).quickHDistance() > kMaxOpenDistance) {
// Close object image and window (silently)
obj->setFlags(0, objectOpen);
delete n;