[Freeciv-Dev] (PR#11036) freeciv client-xaw compilation problems

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

> [infyquest@xxxxxxxxx - Tue Nov 16 06:03:08 2004]:
> 
> Hi,
> 
> i am having problems compiling freeciv

Here's a patch.  Untested.

jason

Index: client/gui-xaw/actions.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/actions.c,v
retrieving revision 1.22
diff -u -r1.22 actions.c
--- client/gui-xaw/actions.c    23 Aug 2004 23:24:45 -0000      1.22
+++ client/gui-xaw/actions.c    17 Nov 2004 06:12:10 -0000
@@ -274,7 +274,7 @@
 {
   if (can_client_change_view()
       && is_menu_item_active(MENU_GOVERNMENT, MENU_GOVERNMENT_REVOLUTION)) {
-    popup_revolution_dialog();
+    popup_revolution_dialog(game.government_when_anarchy);
   }
 }
 
Index: client/gui-xaw/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/dialogs.c,v
retrieving revision 1.105
diff -u -r1.105 dialogs.c
--- client/gui-xaw/dialogs.c    10 Nov 2004 17:01:59 -0000      1.105
+++ client/gui-xaw/dialogs.c    17 Nov 2004 06:12:11 -0000
@@ -1241,8 +1241,9 @@
 /****************************************************************
 ...
 *****************************************************************/
-void popup_revolution_dialog(void)
+void popup_revolution_dialog(int government)
 {
+  assert(government == game.government_when_anarchy);
   popup_message_dialog(toplevel, "revolutiondialog", 
                       _("You say you wanna revolution?"),
                       revolution_callback_yes, 0, 0,
Index: client/gui-xaw/dialogs.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/dialogs.h,v
retrieving revision 1.8
diff -u -r1.8 dialogs.h
--- client/gui-xaw/dialogs.h    7 Aug 2002 11:21:43 -0000       1.8
+++ client/gui-xaw/dialogs.h    17 Nov 2004 06:12:11 -0000
@@ -19,6 +19,7 @@
 
 struct tile;
 
+void popup_revolution_dialog(int government);
 Widget popup_message_dialog(Widget parent, const char *shellname,
                            const char *text, ...);
 void destroy_message_dialog(Widget button);
Index: client/gui-xaw/helpdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/helpdlg.c,v
retrieving revision 1.53
diff -u -r1.53 helpdlg.c
--- client/gui-xaw/helpdlg.c    27 Sep 2004 14:19:20 -0000      1.53
+++ client/gui-xaw/helpdlg.c    17 Nov 2004 06:12:11 -0000
@@ -957,30 +957,30 @@
               tile_types[i].trade);
       xaw_set_label (help_terrain_food_shield_trade_data, buf);
 
-      if (*(tile_types[i].special_1_name))
+      if (*(tile_types[i].special[0].name))
        {
          sprintf (buf, _("%s F/R/T:"),
-                  tile_types[i].special_1_name);
+                  tile_types[i].special[0].name);
          xaw_set_label (help_terrain_special_1, buf);
          sprintf (buf, "%d/%d/%d",
-                  tile_types[i].food_special_1,
-                  tile_types[i].shield_special_1,
-                  tile_types[i].trade_special_1);
+                  tile_types[i].special[0].food,
+                  tile_types[i].special[0].shield,
+                  tile_types[i].special[0].trade);
          xaw_set_label (help_terrain_special_1_data, buf);
        } else {
          xaw_set_label (help_terrain_special_1, "");
          xaw_set_label (help_terrain_special_1_data, "");
        }
 
-      if (*(tile_types[i].special_2_name))
+      if (*(tile_types[i].special[1].name))
        {
          sprintf (buf, _("%s F/R/T:"),
-                  tile_types[i].special_2_name);
+                  tile_types[i].special[1].name);
          xaw_set_label (help_terrain_special_2, buf);
          sprintf (buf, "%d/%d/%d",
-                  tile_types[i].food_special_2,
-                  tile_types[i].shield_special_2,
-                  tile_types[i].trade_special_2);
+                  tile_types[i].special[1].food,
+                  tile_types[i].special[1].shield,
+                  tile_types[i].special[1].trade);
          xaw_set_label (help_terrain_special_2_data, buf);
        } else {
          xaw_set_label (help_terrain_special_2, "");
Index: client/gui-xaw/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.c,v
retrieving revision 1.70
diff -u -r1.70 menu.c
--- client/gui-xaw/menu.c       10 Nov 2004 17:01:59 -0000      1.70
+++ client/gui-xaw/menu.c       17 Nov 2004 06:12:11 -0000
@@ -558,7 +558,7 @@
     popup_worklists_dialog(game.player_ptr);
     break;
   case MENU_GOVERNMENT_REVOLUTION:
-    popup_revolution_dialog();
+    popup_revolution_dialog(game.government_when_anarchy);
     break;
   }
 }