[Freeciv-Dev] (PR#10685) Revolution doesn't end

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

> [bruce@xxxxxxxxx - Fri Oct 22 22:11:56 2004]:
> 
> Hi,
> 
>    Searched the bug database but didn't find this one:  If you start a 
> revolution by just choosing 'revolution' rather than picking a new 
> government, you get the message 'revolution ended' every turn, but no 
> popup to choose the new government, so you just stay in anarchy.

This patch improves the behavior.

jason

? a.out
? foo.c
? freeciv-2.0.0-beta3.tar.gz
Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.408.2.6
diff -u -r1.408.2.6 packhand.c
--- client/packhand.c   4 Nov 2004 20:57:49 -0000       1.408.2.6
+++ client/packhand.c   8 Nov 2004 17:44:55 -0000
@@ -1583,7 +1583,9 @@
       && pplayer->government == game.government_when_anarchy
       && (!game.player_ptr->ai.control || ai_popup_windows)
       && can_client_change_view()) {
-    create_event(NULL, E_REVOLT_DONE, _("Game: Revolution finished"));
+    create_event(NULL, E_REVOLT_DONE,
+                _("You should choose a new government from the "
+                  "government menu."));
   }
   
   update_players_dialog();
Index: server/plrhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/plrhand.c,v
retrieving revision 1.330.2.6
diff -u -r1.330.2.6 plrhand.c
--- server/plrhand.c    4 Nov 2004 17:39:14 -0000       1.330.2.6
+++ server/plrhand.c    8 Nov 2004 17:44:58 -0000
@@ -871,10 +871,11 @@
          "Revolution finished for %s.  Government is %s.  Revofin %d (%d).",
          pplayer->name, get_government_name(government),
          pplayer->revolution_finishes, game.turn);
-  notify_player(pplayer, _("Game: %s now governs the %s as a %s."), 
-               pplayer->name, 
-               get_nation_name_plural(pplayer->nation),
-               get_government_name(government));  
+  notify_player_ex(pplayer, NULL, E_REVOLT_DONE,
+                  _("Game: %s now governs the %s as a %s."), 
+                  pplayer->name, 
+                  get_nation_name_plural(pplayer->nation),
+                  get_government_name(government));  
   gamelog(GAMELOG_GOVERNMENT, _("%s form a %s"),
          get_nation_name_plural(pplayer->nation),
          get_government_name(government));