Complete.Org: Mailing Lists: Archives: freeciv-dev: June 2005:
[Freeciv-Dev] (PR#13209) inaccurate goal text
Home

[Freeciv-Dev] (PR#13209) inaccurate goal text

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#13209) inaccurate goal text
From: "Jason Dorje Short" <jdorje@xxxxxxxxx>
Date: Fri, 3 Jun 2005 18:03:26 -0700
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13209 >

If the goal is the same as the current research, the science dialog
shows the wrong number of turns to reach the goal.

This is because is_tech_a_req_for_goal is not reflexive for some reason.
 I assume this is a bug but this patch just changes the caller to work
around it.

-jason

Index: client/text.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/text.c,v
retrieving revision 1.40
diff -u -r1.40 text.c
--- client/text.c       7 May 2005 18:58:02 -0000       1.40
+++ client/text.c       4 Jun 2005 01:01:57 -0000
@@ -495,7 +495,8 @@
   INIT;
 
   if (is_tech_a_req_for_goal(game.player_ptr,
-                            game.player_ptr->research->researching, goal)) {
+                            game.player_ptr->research->researching, goal)
+      || game.player_ptr->research->researching == goal) {
     bulbs_needed -= game.player_ptr->research->bulbs_researched;
   }
 

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#13209) inaccurate goal text, Jason Dorje Short <=