[Fix] Fixed accidental flag overlap.
This commit is contained in:
parent
cf1520b304
commit
9cf2f1c9e9
@ -55,15 +55,15 @@
|
|||||||
#define PILOT_HYPERSPACE (1<<17) /**< Pilot is in hyperspace. */
|
#define PILOT_HYPERSPACE (1<<17) /**< Pilot is in hyperspace. */
|
||||||
#define PILOT_BOARDED (1<<18) /**< Pilot has been boarded already! */
|
#define PILOT_BOARDED (1<<18) /**< Pilot has been boarded already! */
|
||||||
#define PILOT_BRIBED (1<<19) /**< Pilot has been bribed already. */
|
#define PILOT_BRIBED (1<<19) /**< Pilot has been bribed already. */
|
||||||
#define PILOT_DISABLED (1<<16) /**< Pilot is disabled. */
|
#define PILOT_DISABLED (1<<26) /**< Pilot is disabled. */
|
||||||
#define PILOT_DEAD (1<<27) /**< Pilot is on it's death bed. */
|
#define PILOT_DEAD (1<<27) /**< Pilot is on it's death bed. */
|
||||||
#define PILOT_DEATH_SOUND (1<<28) /**< Pilot just did death explosion. */
|
#define PILOT_DEATH_SOUND (1<<28) /**< Pilot just did death explosion. */
|
||||||
#define PILOT_EXPLODED (1<<29) /**< Pilot did final death explosion. */
|
#define PILOT_EXPLODED (1<<29) /**< Pilot did final death explosion. */
|
||||||
#define PILOT_DELETE (1<<30) /**< Pilot will get delete asap. */
|
#define PILOT_DELETE (1<<30) /**< Pilot will get delete asap. */
|
||||||
|
|
||||||
/* Just makes life simpler. */
|
/* Just makes life simpler. */
|
||||||
#define pilot_isPlayer(p) ((p)->flags & PILOT_PLAYER) /**< Check if pilot is a player. */
|
#define pilot_isPlayer(p) pilot_isFlag(p, PILOT_PLAYER) /**< Check if pilot is a player. */
|
||||||
#define pilot_isDisabled(p) ((p)->flags & PILOT_DISABLED) /**< Check if pilot is disabled. */
|
#define pilot_isDisabled(p) pilot_isFlag(p, PILOT_DISABLED) /**< Check if pilot is disabled. */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @enum PilotOutfitState
|
* @enum PilotOutfitState
|
||||||
|
Loading…
Reference in New Issue
Block a user