libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Remove commas at ends of enumerations

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-06-29 21:53:45 +02:00
parent 2e4246faa3
commit 6aa642a54a
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
5 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/saga2/assign.h
View File

@ -42,7 +42,7 @@ enum AssignmentTypes {
huntToBeNearActorAssignment,
huntToKillAssignment,
tetheredWanderAssignment,
attendAssignment,
attendAssignment
};
/* ===================================================================== *
@ -118,7 +118,7 @@ class PatrolRouteAssignment : public ActorAssignment {
// assignment
enum {
routeCompleted = (1 << 0),
routeCompleted = (1 << 0)
};
public:
@ -235,7 +235,7 @@ class HuntToBeNearActorAssignment : public ActorAssignment {
uint8 flags;
enum {
track = (1 << 0), // This hunt is a track.
track = (1 << 0) // This hunt is a track.
};
// An initialization function which provides a common ground for
@ -317,7 +317,7 @@ class HuntToKillAssignment : public ActorAssignment {
enum {
track = (1 << 0), // This hunt is a track.
specificActor = (1 << 1), // The actor target is a specific actor
specificActor = (1 << 1) // The actor target is a specific actor
};
// An initialization function which provides a common ground for

2
engines/saga2/sensor.h
View File

@ -45,7 +45,7 @@ enum SensorType {
objectPropertySensor,
specificActorSensor,
actorPropertySensor,
eventSensor,
eventSensor
};
// Sensors will be checked every 5 frames

2
engines/saga2/setup.h
View File

@ -97,7 +97,7 @@ enum borderIDs {
MWLeftBorder,
MWRightBorder1,
MWRightBorder2,
MWRightBorder3,
MWRightBorder3
};
extern WindowDecoration mainWindowDecorations[];

2
engines/saga2/stimtype.h
View File

@ -88,7 +88,7 @@ enum stimuliTypes {
senseDidGive, // we gave something to protag
// Number of sensory types
senseCount,
senseCount
};

36
engines/saga2/task.h
View File

@ -55,11 +55,7 @@ enum TaskType {
bandTask,
bandAndAvoidEnemiesTask,
followPatrolRouteTask,
attendTask,
#if 0
defendTask,
parryTask,
#endif
attendTask
};
/* ===================================================================== *
@ -463,12 +459,12 @@ class GotoObjectTargetTask : public GotoTask {
enum {
track = (1 << 0),
inSight = (1 << 1),
inSight = (1 << 1)
};
// static const doesn't work in Visual C++
enum {
sightRate = 16,
sightRate = 16
};
// static const int16 sightRate = 16;
@ -609,7 +605,7 @@ class GoAwayFromTask : public Task {
uint8 flags;
enum {
run = (1 << 0),
run = (1 << 0)
};
public:
@ -746,7 +742,7 @@ class HuntTask : public Task {
enum HuntFlags {
huntWander = (1 << 0), // Indicates that subtask is a wander task
huntGoto = (1 << 1), // Indicates that subtask is a goto task
huntGoto = (1 << 1) // Indicates that subtask is a goto task
};
public:
@ -843,7 +839,7 @@ class HuntToBeNearLocationTask : public HuntLocationTask {
// static const doesn't work in Visual C++
enum {
targetEvaluateRate = 64,
targetEvaluateRate = 64
};
// static const uint8 targetEvaluateRate;
@ -933,7 +929,7 @@ class HuntToBeNearObjectTask : public HuntObjectTask {
uint8 targetEvaluateCtr;
enum {
targetEvaluateRate = 64,
targetEvaluateRate = 64
};
// static const uint8 targetEvaluateRate;
@ -990,7 +986,7 @@ class HuntToPossessTask : public HuntObjectTask {
uint8 targetEvaluateCtr;
enum {
targetEvaluateRate = 64,
targetEvaluateRate = 64
};
// static const uint8 targetEvaluateRate;
@ -1042,7 +1038,7 @@ class HuntActorTask : public HuntTask {
uint8 flags;
enum {
track = (1 << 0),
track = (1 << 0)
};
protected:
@ -1090,14 +1086,14 @@ class HuntToBeNearActorTask : public HuntActorTask {
uint8 targetEvaluateCtr;
enum {
targetEvaluateRate = 16,
targetEvaluateRate = 16
};
// static const uint8 targetEvaluateRate;
public:
enum {
tooClose = 12,
tooClose = 12
};
// Constructor -- initial construction
@ -1164,17 +1160,17 @@ class HuntToKillTask : public HuntActorTask {
uint8 specialAttackCtr;
enum {
targetEvaluateRate = 16,
targetEvaluateRate = 16
};
enum {
currentWeaponBonus = 1,
currentWeaponBonus = 1
};
uint8 flags;
enum {
evalWeapon = (1 << 0),
evalWeapon = (1 << 0)
};
// static const uint8 targetEvaluateRate;
@ -1281,7 +1277,7 @@ class BandTask : public HuntTask {
uint8 targetEvaluateCtr;
enum {
targetEvaluateRate = 2,
targetEvaluateRate = 2
};
public:
@ -1631,7 +1627,7 @@ class ParryTask : public Task {
enum {
motionStarted = (1 << 0),
blockStarted = (1 << 1),
blockStarted = (1 << 1)
};
public: