? rc
? msgfmt1.diff
? came_from.diff.txt
? diff
? remove_init.diff
? ok
? circle_iterate-3.diff
? save_palace2.diff
? incite_cost1.diff
? new
? tmp_diff
? trailing_newline_remove1.diff.gz
? unit_move_turns1.diff
? short_worklists1.diff
? sound4.patch
? data/diff
Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.79
diff -u -r1.79 dialogs.c
--- client/gui-gtk/dialogs.c	2001/10/16 09:11:15	1.79
+++ client/gui-gtk/dialogs.c	2001/12/09 16:28:48
@@ -975,7 +975,12 @@
 {
   char buf[128];
 
-  if(game.player_ptr->economic.gold>=pcity->incite_revolt_cost) {
+  if (pcity->incite_revolt_cost == INCITE_IMPOSSIBLE_COST) {
+    my_snprintf(buf, sizeof(buf), _("You can't incite a revolt in %s."),
+		pcity->name);
+    popup_message_dialog(top_vbox, _("City can't be incited!"), buf,
+			 _("Darn"), diplomat_incite_no_callback, 0, 0);
+  } else if (game.player_ptr->economic.gold >= pcity->incite_revolt_cost) {
     my_snprintf(buf, sizeof(buf),
 		_("Incite a revolt for %d gold?\nTreasury contains %d gold."), 
 		pcity->incite_revolt_cost, game.player_ptr->economic.gold);
Index: client/gui-mui/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/dialogs.c,v
retrieving revision 1.33
diff -u -r1.33 dialogs.c
--- client/gui-mui/dialogs.c	2001/09/15 15:31:21	1.33
+++ client/gui-mui/dialogs.c	2001/12/09 16:28:49
@@ -502,8 +502,12 @@
 {
   char buf[128];
 
-  if(game.player_ptr->economic.gold>=pcity->incite_revolt_cost)
-  {
+  if (pcity->incite_revolt_cost == INCITE_IMPOSSIBLE_COST) {
+    my_snprintf(buf, sizeof(buf), _("You can't incite a revolt in %s."),
+		pcity->name);
+    popup_message_dialog(main_wnd, _("City can't be incited!"), buf,
+			 _("Darn"), diplomat_incite_no_callback, 0, 0);
+  } else if (game.player_ptr->economic.gold >= pcity->incite_revolt_cost) {
     my_snprintf(buf, sizeof(buf),_("Incite a revolt for %d gold?\nTreasury contains %d gold."),
             pcity->incite_revolt_cost, game.player_ptr->economic.gold);
     diplomat_target_id = pcity->id;
Index: client/gui-win32/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.c,v
retrieving revision 1.6
diff -u -r1.6 dialogs.c
--- client/gui-win32/dialogs.c	2001/11/20 20:59:38	1.6
+++ client/gui-win32/dialogs.c	2001/12/09 16:28:50
@@ -1557,7 +1557,12 @@
 {
   char buf[128];
 
-  if(game.player_ptr->economic.gold>=pcity->incite_revolt_cost) {
+  if (pcity->incite_revolt_cost == INCITE_IMPOSSIBLE_COST) {
+    my_snprintf(buf, sizeof(buf), _("You can't incite a revolt in %s."),
+		pcity->name);
+    popup_message_dialog(root_window, _("City can't be incited!"), buf,
+			 _("Darn"), diplomat_incite_no_callback, 0, 0);
+  } else if (game.player_ptr->economic.gold >= pcity->incite_revolt_cost) {
     my_snprintf(buf, sizeof(buf),
 		_("Incite a revolt for %d gold?\nTreasury contains %d gold."), 
 		pcity->incite_revolt_cost, game.player_ptr->economic.gold);
Index: client/gui-xaw/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/dialogs.c,v
retrieving revision 1.58
diff -u -r1.58 dialogs.c
--- client/gui-xaw/dialogs.c	2001/10/16 09:11:17	1.58
+++ client/gui-xaw/dialogs.c	2001/12/09 16:28:52
@@ -999,7 +999,12 @@
 {
   char buf[128];
 
-  if(game.player_ptr->economic.gold>=pcity->incite_revolt_cost) {
+  if (pcity->incite_revolt_cost == INCITE_IMPOSSIBLE_COST) {
+    my_snprintf(buf, sizeof(buf), _("You can't incite a revolt in %s."),
+		pcity->name);
+    popup_message_dialog(toplevel, "diplomatnogolddialog", buf,
+			 diplomat_incite_no_callback, 0, 0, NULL);
+  } else if (game.player_ptr->economic.gold >= pcity->incite_revolt_cost) {
     my_snprintf(buf, sizeof(buf),
 		_("Incite a revolt for %d gold?\n"
 		  "Treasury contains %d gold."), 
Index: common/city.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.h,v
retrieving revision 1.93
diff -u -r1.93 city.h
--- common/city.h	2001/10/26 08:07:19	1.93
+++ common/city.h	2001/12/09 16:28:53
@@ -64,6 +64,8 @@
    Some places in the code hardcodes this number (yet). */
 #define CITY_MAP_SIZE 5
 
+#define INCITE_IMPOSSIBLE_COST (1000*1000*1000)
+
 /* Iterate a city map */
 
 #define city_map_iterate(x, y)                     \
@@ -234,7 +236,8 @@
   int food_stock;
   int shield_stock;
   int pollution;
-  int incite_revolt_cost;
+  /* city can't be incites if INCITE_IMPOSSIBLE_COST */
+  int incite_revolt_cost;      
    
   int is_building_unit;    /* boolean unit/improvement */
   int currently_building;
Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.167
diff -u -r1.167 cityturn.c
--- server/cityturn.c	2001/10/26 08:07:21	1.167
+++ server/cityturn.c	2001/12/09 16:28:54
@@ -1153,7 +1153,7 @@
 }
 
 /**************************************************************************
-...
+  Sets the incite_revolt_cost field in the given city.
 **************************************************************************/
 void city_incite_cost(struct city *pcity)
 {
@@ -1161,9 +1161,9 @@
   struct city *capital;
   int dist;
   
-  if (city_got_building(pcity, B_PALACE)) 
-    pcity->incite_revolt_cost=1000000;
-  else {
+  if (city_got_building(pcity, B_PALACE)) {
+    pcity->incite_revolt_cost = INCITE_IMPOSSIBLE_COST;
+  } else {
     pcity->incite_revolt_cost=city_owner(pcity)->economic.gold +1000;
     capital=find_palace(city_owner(pcity));
     if (capital) {