[Freeciv-Dev] Re: (PR#10368) RfP: #define ACTIVITY_FACTOR

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10368 >

Per I. Mathisen wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=10368 >
> 
> On Sat, 16 Oct 2004, Jason Short wrote:
> 
>>The *10 factor for activities was added in:
>>
>>date: 2004/01/11 17:45:04;author: per;  state: Exp;  lines: +9 -9
>>Add support for multiple veteran levels, defined in units.ruleset. See
>>new documentation in units.ruleset for more info. Patch by James Blewitt
>><james.blewitt@xxxxxxxxxxxxxx> Rafal Bursig <bursig@xxxxxxxxx> and me.
>>
>>However there is no documentation of why it would be needed and no PR#
>>to look up the original discussion.So I have no idea why it is needed.
>> Per, can you shed any light on this?
> 
> 
> IIRC, it was not added in this patch, merely extended to cover new cases.
> There was already some places where it was used, and the choice was to
> either rewrite this code, or make the new code to match. But I could be
> remembering wrongly.

Here is the diff (from map.c only).

jason

Index: common/map.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.c,v
retrieving revision 1.154
retrieving revision 1.153
diff -u -r1.154 -r1.153
--- common/map.c        11 Jan 2004 17:45:04 -0000      1.154
+++ common/map.c        8 Dec 2003 19:19:56 -0000       1.153
@@ -767,7 +767,7 @@
 ***************************************************************/
 int map_build_road_time(int x, int y)
 {
-  return tile_types[map_get_terrain(x, y)].road_time * 10;
+  return tile_types[map_get_terrain(x, y)].road_time;
 }
 
 /***************************************************************
@@ -775,7 +775,7 @@
 ***************************************************************/
 int map_build_irrigation_time(int x, int y)
 {
-  return tile_types[map_get_terrain(x, y)].irrigation_time * 10;
+  return tile_types[map_get_terrain(x, y)].irrigation_time;
 }
 
 /***************************************************************
@@ -783,7 +783,7 @@
 ***************************************************************/
 int map_build_mine_time(int x, int y)
 {
-  return tile_types[map_get_terrain(x, y)].mining_time * 10;
+  return tile_types[map_get_terrain(x, y)].mining_time;
 }
 
 /***************************************************************
@@ -791,7 +791,7 @@
 ***************************************************************/
 int map_transform_time(int x, int y)
 {
-  return tile_types[map_get_terrain(x, y)].transform_time * 10;
+  return tile_types[map_get_terrain(x, y)].transform_time;
 }
 
 /***************************************************************
@@ -799,7 +799,7 @@
 ***************************************************************/
 int map_build_rail_time(int x, int y)
 {
-  return 30;
+  return 3;
 }
 
 /***************************************************************
@@ -807,7 +807,7 @@
 ***************************************************************/
 int map_build_airbase_time(int x, int y)
 {
-  return 30;
+  return 3;
 }
 
 /***************************************************************
@@ -815,7 +815,7 @@
 ***************************************************************/
 int map_build_fortress_time(int x, int y)
 {
-  return 30;
+  return 3;
 }
 
 /***************************************************************
@@ -823,7 +823,7 @@
 ***************************************************************/
 int map_clean_pollution_time(int x, int y)
 {
-  return 30;
+  return 3;
 }
 
 /***************************************************************
@@ -831,7 +831,7 @@
 ***************************************************************/
 int map_clean_fallout_time(int x, int y)
 {
-  return 30;
+  return 3;
 }
 
 /***************************************************************