[Freeciv-Dev] (PR#10194) Production of Barracks III is upgraded to Barracks III

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

> [bretta - Sun Sep 19 18:14:13 2004]:
> 
> The attached JPEG shows the message "Production of Barracks III is 
> upgraded to Barracks III".  This occurred when I had just researched 
> Mobile Warfare during the previous turn.  I'm not sure if it matters, 
> but I had finished Mobile Warfare via a caravan, not during the 
> beginning of the turn.

I suppose the screenshot wouldn't have been necessary if I hadn't
misread the subject ;-).

This patch should fix it, although I did not test.

jason

Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.262
diff -u -r1.262 cityturn.c
--- server/cityturn.c   14 Sep 2004 17:39:32 -0000      1.262
+++ server/cityturn.c   21 Sep 2004 01:14:19 -0000
@@ -756,12 +756,12 @@
                                                  pcity->currently_building);
 
   if (can_build_improvement(pcity, upgrades_to)) {
+    notify_player_ex(pplayer, pcity->x, pcity->y, E_UNIT_UPGRADED,
+                    _("Game: Production of %s is upgraded to %s in %s."),
+                    get_improvement_type(pcity->currently_building)->name,
+                    get_improvement_type(upgrades_to)->name,
+                    pcity->name);
     pcity->currently_building = upgrades_to;
-    notify_player_ex(pplayer, pcity->x, pcity->y, E_UNIT_UPGRADED, 
-                 _("Game: Production of %s is upgraded to %s in %s."),
-                 get_improvement_type(pcity->currently_building)->name, 
-                 get_improvement_type(upgrades_to)->name , 
-                 pcity->name);
   }
 }