diff options
Diffstat (limited to 'src/unit.h')
| -rw-r--r-- | src/unit.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/unit.h b/src/unit.h index 03031892d0..aa80aadb1b 100644 --- a/src/unit.h +++ b/src/unit.h @@ -78,9 +78,9 @@ enum UnitLoadState { enum UnitActiveState { UNIT_ACTIVE, - UNIT_ACTIVE_RELOADING, + UNIT_RELOADING, UNIT_INACTIVE, - UNIT_INACTIVE_MAINTENANCE, + UNIT_MAINTENANCE, UNIT_ACTIVATING, UNIT_DEACTIVATING, _UNIT_ACTIVE_STATE_MAX, @@ -88,19 +88,19 @@ enum UnitActiveState { }; static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_RELOADING; } static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_RELOADING; } static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING; } static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE; } enum UnitDependency { |