Author: jtn
Date: Mon Sep 12 22:56:16 2016
New Revision: 33784

URL: http://svn.gna.org/viewcvs/freeciv?rev=33784&view=rev
Log:
Fix references to non-existent ACTIVITY_COUNT in comments.

Modified:
    trunk/common/tile.h
    trunk/common/unit.c
    trunk/common/unit.h

Modified: trunk/common/tile.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/tile.h?rev=33784&r1=33783&r2=33784&view=diff
==============================================================================
--- trunk/common/tile.h (original)
+++ trunk/common/tile.h Mon Sep 12 22:56:16 2016
@@ -158,7 +158,7 @@
 enum known_type tile_get_known(const struct tile *ptile,
                              const struct player *pplayer);
 
-/* An arbitrary somewhat integer value.  Activity times are multiplied by
+/* A somewhat arbitrary integer value.  Activity times are multiplied by
  * this amount, and divided by them later before being used.  This may
  * help to avoid rounding errors; however it should probably be removed. */
 #define ACTIVITY_FACTOR 10

Modified: trunk/common/unit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=33784&r1=33783&r2=33784&view=diff
==============================================================================
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Mon Sep 12 22:56:16 2016
@@ -388,7 +388,7 @@
   effects).  Usually this is just used for settlers but the value is also
   used for military units doing fortify/pillage activities.
 
-  The speed is multiplied by ACTIVITY_COUNT.
+  The speed is multiplied by ACTIVITY_FACTOR.
 **************************************************************************/
 int get_activity_rate(const struct unit *punit)
 {
@@ -406,7 +406,7 @@
    * uninjured ones.  Note the value is never less than SINGLE_MOVE. */
   int move_rate = unit_type_get(punit)->move_rate;
 
-  /* All settler actions are multiplied by ACTIVITY_COUNT. */
+  /* All settler actions are multiplied by ACTIVITY_FACTOR. */
   return ACTIVITY_FACTOR
          * (float)vlevel->power_fact / 100
          * move_rate / SINGLE_MOVE;
@@ -416,7 +416,7 @@
   Returns the amount of work a unit does (will do) on an activity this
   turn.  Units that have no MP do no work.
 
-  The speed is multiplied by ACTIVITY_COUNT.
+  The speed is multiplied by ACTIVITY_FACTOR.
 **************************************************************************/
 int get_activity_rate_this_turn(const struct unit *punit)
 {

Modified: trunk/common/unit.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.h?rev=33784&r1=33783&r2=33784&view=diff
==============================================================================
--- trunk/common/unit.h (original)
+++ trunk/common/unit.h Mon Sep 12 22:56:16 2016
@@ -133,7 +133,7 @@
   enum unit_activity activity;
 
   /* The amount of work that has been done on the current activity.  This
-   * is counted in turns but is multiplied by ACTIVITY_COUNT (which allows
+   * is counted in turns but is multiplied by ACTIVITY_FACTOR (which allows
    * fractional values in some cases). */
   int activity_count;
 


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

Reply via email to