Author: sveinung Date: Fri Aug 14 15:05:05 2015 New Revision: 29497 URL: http://svn.gna.org/viewcvs/freeciv?rev=29497&view=rev Log: Replace gen_action_is_valid()
Add the new function action_id_is_valid(). It checks if an action ID is valid. Have it replace all calls to gen_action_is_valid(). See patch #6226 Modified: trunk/ai/default/aicity.c trunk/common/actions.c trunk/common/actions.h trunk/server/ruleset.c Modified: trunk/ai/default/aicity.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=29497&r1=29496&r2=29497&view=diff ============================================================================== --- trunk/ai/default/aicity.c (original) +++ trunk/ai/default/aicity.c Fri Aug 14 15:05:05 2015 @@ -1098,7 +1098,7 @@ "Action not aimed at cities"); } - fc_assert_msg(gen_action_is_valid(action_id), + fc_assert_msg(action_id_is_valid(action_id), "Action %d don't exist.", action_id); /* Wrong action. Ignore it. */ Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=29497&r1=29496&r2=29497&view=diff ============================================================================== --- trunk/common/actions.c (original) +++ trunk/common/actions.c Fri Aug 14 15:05:05 2015 @@ -208,6 +208,14 @@ } /************************************************************************** + Returns TRUE iff the specified action ID refers to a valid action. +**************************************************************************/ +bool action_id_is_valid(const int action_id) +{ + return gen_action_is_valid(action_id); +} + +/************************************************************************** Return the action with the given id. **************************************************************************/ struct action *action_by_number(int action_id) @@ -225,7 +233,7 @@ /* Actions are still hard coded in the gen_action enum. */ int action_id = gen_action_by_name(name, fc_strcasecmp); - if (!gen_action_is_valid(action_id)) { + if (!action_id_is_valid(action_id)) { return NULL; } @@ -331,7 +339,7 @@ fc_assert(prob == ACTPROB_NA); /* but the action should be valid */ - fc_assert_ret_val_msg(gen_action_is_valid(action_id), + fc_assert_ret_val_msg(action_id_is_valid(action_id), "Invalid action", "Invalid action %d", action_id); Modified: trunk/common/actions.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=29497&r1=29496&r2=29497&view=diff ============================================================================== --- trunk/common/actions.h (original) +++ trunk/common/actions.h Fri Aug 14 15:05:05 2015 @@ -191,6 +191,8 @@ bool actions_are_ready(void); +bool action_id_is_valid(const int action_id); + struct action *action_by_number(int action_id); struct action *action_by_rule_name(const char *name); Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=29497&r1=29496&r2=29497&view=diff ============================================================================== --- trunk/server/ruleset.c (original) +++ trunk/server/ruleset.c Fri Aug 14 15:05:05 2015 @@ -5381,7 +5381,7 @@ } action = gen_action_by_name(action_text, fc_strcasecmp); - if (!gen_action_is_valid(action)) { + if (!action_id_is_valid(action)) { ruleset_error(LOG_ERROR, "\"%s\" [%s] lists unknown action type \"%s\".", filename, sec_name, action_text); ok = FALSE; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits