[Freeciv-Dev] (PR#11252) city conquer message missing

["Christian Knoke" <chrisk@xxxxxxxxx>]

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


CVS 29 NOV 2004 S2 GTK2

When a city is successfully conquered, no message is given in the message
window(s), only in the chat window.

This is the same bug as in
http://rt.freeciv.org/Ticket/Display.html?id=11130 (already fixed),
but for conquer or 'free'ing' a city.

Patch attached. I just transferred Jasons fixes on this.

Christian

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

diff -Nur ../s20/freeciv/server/citytools.c ./server/citytools.c
--- ../s20/freeciv/server/citytools.c   2004-11-24 11:58:25.000000000 +0100
+++ ./server/citytools.c        2004-11-29 19:14:24.000000000 +0100
@@ -1257,7 +1257,7 @@
   cplayer->economic.gold -= coins;
   send_player_info(cplayer, cplayer);
   if (pcity->original != pplayer->player_no) {
-    notify_player_ex(pplayer, pcity->tile, E_NOEVENT, 
+    notify_player_ex(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
                     _("Game: You conquer %s, your lootings accumulate"
                       " to %d gold!"), 
                     pcity->name, coins);
@@ -1270,7 +1270,7 @@
            pcity->tile->x, pcity->tile->y,
            get_nation_name_plural(pplayer->nation));
   } else {
-    notify_player_ex(pplayer, pcity->tile, E_NOEVENT, 
+    notify_player_ex(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
                     _("Game: You have liberated %s!"
                       " Lootings accumulate to %d gold."),
                     pcity->name, coins);