Author: cazfi Date: Sun May 8 07:24:04 2016 New Revision: 32616 URL: http://svn.gna.org/viewcvs/freeciv?rev=32616&view=rev Log: Inlined utype_has_flag() and uclass_has_flag()
See patch #7189 Modified: trunk/common/unittype.c trunk/common/unittype.h Modified: trunk/common/unittype.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=32616&r1=32615&r2=32616&view=diff ============================================================================== --- trunk/common/unittype.c (original) +++ trunk/common/unittype.c Sun May 8 07:24:04 2016 @@ -177,25 +177,6 @@ const struct player *pplayer) { return ut->happy_cost * get_player_bonus(pplayer, EFT_UNHAPPY_FACTOR); -} - -/************************************************************************** - Return whether the given unit class has the flag. -**************************************************************************/ -bool uclass_has_flag(const struct unit_class *punitclass, - enum unit_class_flag_id flag) -{ - fc_assert_ret_val(unit_class_flag_id_is_valid(flag), FALSE); - return BV_ISSET(punitclass->flags, flag); -} - -/************************************************************************** - Return whether the given unit type has the flag. -**************************************************************************/ -bool utype_has_flag(const struct unit_type *punittype, int flag) -{ - fc_assert_ret_val(unit_type_flag_id_is_valid(flag), FALSE); - return BV_ISSET(punittype->flags, flag); } /************************************************************************** Modified: trunk/common/unittype.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=32616&r1=32615&r2=32616&view=diff ============================================================================== --- trunk/common/unittype.h (original) +++ trunk/common/unittype.h Sun May 8 07:24:04 2016 @@ -569,7 +569,14 @@ /* General unit type flag and role routines */ bool unit_has_type_flag(const struct unit *punit, enum unit_type_flag_id flag); -bool utype_has_flag(const struct unit_type *punittype, int flag); + +/************************************************************************** + Return whether the given unit type has the flag. +**************************************************************************/ +static inline bool utype_has_flag(const struct unit_type *punittype, int flag) +{ + return BV_ISSET(punittype->flags, flag); +} bool unit_has_type_role(const struct unit *punit, enum unit_role_id role); bool utype_has_role(const struct unit_type *punittype, int role); @@ -652,8 +659,14 @@ const char *uclass_rule_name(const struct unit_class *pclass); const char *uclass_name_translation(const struct unit_class *pclass); -bool uclass_has_flag(const struct unit_class *punitclass, - enum unit_class_flag_id flag); +/************************************************************************** + Return whether the given unit class has the flag. +**************************************************************************/ +static inline bool uclass_has_flag(const struct unit_class *punitclass, + enum unit_class_flag_id flag) +{ + return BV_ISSET(punitclass->flags, flag); +} void user_unit_class_flags_init(void); void set_user_unit_class_flag_name(enum unit_class_flag_id id, _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits