Author: sveinung
Date: Wed Apr  5 16:22:14 2017
New Revision: 35201

URL: http://svn.gna.org/viewcvs/freeciv?rev=35201&view=rev
Log:
Stop sharing requirement_unit_state_ereq().

Have it live in common/unittype.c where it is used.

See hrm Feature #649817

Modified:
    trunk/common/requirements.h
    trunk/common/unittype.c

Modified: trunk/common/requirements.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.h?rev=35201&r1=35200&r2=35201&view=diff
==============================================================================
--- trunk/common/requirements.h (original)
+++ trunk/common/requirements.h Wed Apr  5 16:22:14 2017
@@ -209,9 +209,6 @@
                           const bool present,
                           const int max_value);
 
-#define requirement_unit_state_ereq(_id_, _present_)                       \
-  requirement_kind_ereq(_id_, REQ_RANGE_LOCAL, _present_, USP_COUNT)
-
 #define requirement_diplrel_ereq(_id_, _range_, _present_)                \
   requirement_kind_ereq(_id_, _range_, _present_, DRO_LAST)
 

Modified: trunk/common/unittype.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=35201&r1=35200&r2=35201&view=diff
==============================================================================
--- trunk/common/unittype.c     (original)
+++ trunk/common/unittype.c     Wed Apr  5 16:22:14 2017
@@ -339,6 +339,10 @@
  * property is FALSE
  */
 BV_DEFINE(bv_ustate_act_cache, USP_COUNT * 2);
+
+/* Cache position lookup functions */
+#define requirement_unit_state_ereq(_id_, _present_)                       \
+  requirement_kind_ereq(_id_, REQ_RANGE_LOCAL, _present_, USP_COUNT)
 
 /* Caches for each unit type */
 static bv_ustate_act_cache ustate_act_cache[U_LAST][ACTION_AND_FAKES];


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to