Author: sveinung
Date: Mon Jul 4 16:46:33 2016
New Revision: 33163
URL: http://svn.gna.org/viewcvs/freeciv?rev=33163&view=rev
Log:
An action probability check shouldn't change it.
Declare it const.
See patch #7366
Modified:
branches/S2_6/common/actions.c
branches/S2_6/common/actions.h
Modified: branches/S2_6/common/actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- branches/S2_6/common/actions.c (original)
+++ branches/S2_6/common/actions.c Mon Jul 4 16:46:33 2016
@@ -54,10 +54,14 @@
const struct output_type *target_output,
const struct specialist *target_specialist);
-static inline bool action_prob_is_signal(action_probability probability);
-static inline bool action_prob_not_relevant(action_probability probability);
-static inline bool action_prob_unknown(action_probability probability);
-static inline bool action_prob_not_impl(action_probability probability);
+static inline bool
+action_prob_is_signal(const action_probability probability);
+static inline bool
+action_prob_not_relevant(const action_probability probability);
+static inline bool
+action_prob_unknown(const action_probability probability);
+static inline bool
+action_prob_not_impl(const action_probability probability);
/**************************************************************************
Initialize the actions and the action enablers.
@@ -1337,7 +1341,7 @@
Returns TRUE iff the given action probability belongs to an action that
may be possible.
**************************************************************************/
-bool action_prob_possible(action_probability probability)
+bool action_prob_possible(const action_probability probability)
{
return ACTPROB_IMPOSSIBLE != probability && ACTPROB_NA != probability;
}
@@ -1346,7 +1350,8 @@
Returns TRUE iff the given action probability represents the lack of
an action probability.
**************************************************************************/
-static inline bool action_prob_not_relevant(action_probability probability)
+static inline bool
+action_prob_not_relevant(const action_probability probability)
{
return ACTPROB_NA == probability;
}
@@ -1355,7 +1360,8 @@
Returns TRUE iff the given action probability represents that support
for finding this action probability currently is missing from Freeciv.
**************************************************************************/
-static inline bool action_prob_not_impl(action_probability probability)
+static inline bool
+action_prob_not_impl(const action_probability probability)
{
return ACTPROB_NOT_IMPLEMENTED == probability;
}
@@ -1368,7 +1374,8 @@
state the player don't have access to. It may be possible for the player
to later gain access to this game state.
**************************************************************************/
-static inline bool action_prob_unknown(action_probability probability)
+static inline bool
+action_prob_unknown(const action_probability probability)
{
return ACTPROB_NOT_KNOWN == probability;
}
@@ -1377,7 +1384,8 @@
Returns TRUE iff the given action probability represents a special
signal value rather than a regular action probability value.
**************************************************************************/
-static inline bool action_prob_is_signal(action_probability probability)
+static inline bool
+action_prob_is_signal(const action_probability probability)
{
return probability < 0 || probability > 200;
}
Modified: branches/S2_6/common/actions.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.h?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- branches/S2_6/common/actions.h (original)
+++ branches/S2_6/common/actions.h Mon Jul 4 16:46:33 2016
@@ -182,7 +182,7 @@
const int action_id,
const struct unit* victim);
-bool action_prob_possible(action_probability probability);
+bool action_prob_possible(const action_probability probability);
action_probability action_prob_new_impossible(void);
action_probability action_prob_new_not_relevant(void);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
