Author: sveinung
Date: Fri Aug 14 15:08:58 2015
New Revision: 29501
URL: http://svn.gna.org/viewcvs/freeciv?rev=29501&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:
branches/S2_6/ai/default/aicity.c
branches/S2_6/common/actions.c
branches/S2_6/common/actions.h
branches/S2_6/server/ruleset.c
Modified: branches/S2_6/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aicity.c?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- branches/S2_6/ai/default/aicity.c (original)
+++ branches/S2_6/ai/default/aicity.c Fri Aug 14 15:08:58 2015
@@ -1088,7 +1088,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: branches/S2_6/common/actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- branches/S2_6/common/actions.c (original)
+++ branches/S2_6/common/actions.c Fri Aug 14 15:08:58 2015
@@ -182,6 +182,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)
@@ -263,7 +271,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: branches/S2_6/common/actions.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.h?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- branches/S2_6/common/actions.h (original)
+++ branches/S2_6/common/actions.h Fri Aug 14 15:08:58 2015
@@ -173,6 +173,8 @@
bool actions_are_ready(void);
+bool action_id_is_valid(const int action_id);
+
struct action *action_by_number(int action_id);
enum action_actor_kind action_get_actor_kind(int action_id);
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=29501&r1=29500&r2=29501&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Fri Aug 14 15:08:58 2015
@@ -5289,7 +5289,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
