? rc
? diff
? whole_diff
? msgfmt1.diff
? local_warmap131201.diff
? queue
? unit_move_turns1.diff
Index: client/helpdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdata.c,v
retrieving revision 1.38
diff -u -r1.38 helpdata.c
--- client/helpdata.c	2001/09/15 15:31:19	1.38
+++ client/helpdata.c	2002/01/11 13:56:09
@@ -722,6 +722,18 @@
   assert(buf&&user_text);
   strcpy(buf, user_text);
 
+  if (get_invention(game.player_ptr, i) != TECH_KNOWN) {
+    sprintf(buf + strlen(buf),
+	    _("%d bulbs %s are required for this tech only."
+	      "Total costs are %d bulbs. " "Depends on %d other techs. "
+	      "You need to research %d other techs first.\n"),
+	    base_total_bulbs_required(game.player_ptr, i),
+	    tech_has_fixed_cost(i) ? _("(constant)") : "",
+	    total_bulbs_required_for_goal(game.player_ptr, i),
+	    advances[i].num_reqs - 1,
+	    num_unknown_techs_for_goal(game.player_ptr, i));
+  }
+
   for(gov=0; gov<game.government_count; gov++) {
     struct government *g = get_government(gov);
     if (g->required_tech == i) {
Index: common/tech.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/tech.c,v
retrieving revision 1.32
diff -u -r1.32 tech.c
--- common/tech.c	2002/01/11 13:50:49	1.32
+++ common/tech.c	2002/01/11 13:56:10
@@ -414,6 +414,17 @@
 }
 
 /**************************************************************************
+ Returns true if the costs for the given technology will stay constant
+ during the game. False otherwise.
+**************************************************************************/
+int tech_has_fixed_cost(Tech_Type_id tech)
+{
+  return ((game.rgame.tech_cost_style == 1
+          || game.rgame.tech_cost_style == 2)
+         && game.rgame.tech_leakage == 0);
+}
+
+/**************************************************************************
  Returns the number of technologies the player need to research to
  make the goal technology _reachable_. So to get the benefits of the
  goal technology the player has to reseach
Index: common/tech.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/tech.h,v
retrieving revision 1.27
diff -u -r1.27 tech.h
--- common/tech.h	2002/01/11 13:50:50	1.27
+++ common/tech.h	2002/01/11 13:56:10
@@ -104,6 +104,7 @@
 
 int total_bulbs_required(struct player *pplayer);
 int base_total_bulbs_required(struct player *pplayer,Tech_Type_id tech);
+int tech_has_fixed_cost(Tech_Type_id tech);
 
 int num_unknown_techs_for_goal(struct player *plr, Tech_Type_id goal);
 int total_bulbs_required_for_goal(struct player *pplayer, Tech_Type_id goal);