libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAGA2: Rename enums in property.h

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-10-29 13:50:59 +02:00
parent b46e166050
commit e00bdadfd2
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/saga2/actor.cpp
View File

@ -2415,11 +2415,11 @@ void Actor::evaluateNeeds() {
if (canSenseActorProperty(
info,
maxSenseRange,
actorPropIDEnemy)
kActorPropIDEnemy)
|| canSenseActorPropertyIndirectly(
info,
maxSenseRange,
actorPropIDEnemy)) {
kActorPropIDEnemy)) {
PlayerActorID playerID = _disposition - kDispositionPlayer;
if (isAggressive(playerID))
@ -2614,8 +2614,8 @@ void Actor::updateState() {
_curTask,
ActorPropertyTarget(
_disposition == kDispositionEnemy
? actorPropIDPlayerActor
: actorPropIDEnemy),
? kActorPropIDPlayerActor
: kActorPropIDEnemy),
true);
if (task != nullptr)
@ -2640,8 +2640,8 @@ void Actor::updateState() {
_curTask,
ActorPropertyTarget(
disp == kDispositionEnemy
? actorPropIDPlayerActor
: actorPropIDEnemy));
? kActorPropIDPlayerActor
: kActorPropIDEnemy));
if (task != nullptr)
_curTask->setTask(task);
@ -3104,7 +3104,7 @@ uint8 Actor::evaluateFollowerNeeds(Actor *follower) {
&& follower->canSenseActorProperty(
info,
maxSenseRange,
actorPropIDEnemy)))
kActorPropIDEnemy)))
return kActorGoalAttackEnemy;
return kActorGoalFollowLeader;

36
engines/saga2/property.h
View File

@ -210,16 +210,16 @@ typedef PropertyOr< GameObject > ObjectPropertyOr;
typedef int16 ObjectPropertyID;
enum {
objPropIDObject,
objPropIDActor,
objPropIDWorld,
objPropIDLocked,
objPropIDUnlocked,
objPropIDKey,
objPropIDPlayerActor,
objPropIDEnemy,
kObjPropIDObject,
kObjPropIDActor,
kObjPropIDWorld,
kObjPropIDLocked,
kObjPropIDUnlocked,
kObjPropIDKey,
kObjPropIDPlayerActor,
kObjPropIDEnemy,
objPropIDCount
kObjPropIDCount
};
/* ===================================================================== *
@ -236,12 +236,12 @@ typedef PropertyOr< Actor > ActorPropertyOr;
typedef int16 ActorPropertyID;
enum {
actorPropIDDead,
actorPropIDCenterActor,
actorPropIDPlayerActor,
actorPropIDEnemy,
kActorPropIDDead,
kActorPropIDCenterActor,
kActorPropIDPlayerActor,
kActorPropIDEnemy,
actorPropIDCount
kActorPropIDCount
};
/* ===================================================================== *
@ -258,9 +258,9 @@ typedef PropertyOr< TileInfo > TilePropertyOr;
typedef int16 TilePropertyID;
enum {
tilePropIDHasWater,
kTilePropIDHasWater,
tilePropIDCount
kTilePropIDCount
};
/* ===================================================================== *
@ -367,9 +367,9 @@ public:
typedef int16 MetaTilePropertyID;
enum {
metaTilePropIDHasWater,
kMetaTilePropIDHasWater,
metaTilePropIDCount
kMetaTilePropIDCount
};
bool objIsObject(GameObject *obj);

2
engines/saga2/task.cpp
View File

@ -3676,7 +3676,7 @@ bool BandTask::BandAndAvoidEnemiesRepulsorIterator::firstEnemyRepulsor(
int16 actorDistArray[ARRAYSIZE(_actorArray)];
TargetActorArray taa(ARRAYSIZE(_actorArray), _actorArray, actorDistArray);
ActorPropertyTarget target(actorPropIDEnemy);
ActorPropertyTarget target(kActorPropIDEnemy);
_numActors = target.actor(_a->world(), _a->getLocation(), taa);