Complete.Org: Mailing Lists: Archives: freeciv-dev: February 2006:
[Freeciv-Dev] (PR#15576) don't try to edit pollution
Home

[Freeciv-Dev] (PR#15576) don't try to edit pollution

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#15576) don't try to edit pollution
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 15 Feb 2006 16:04:02 -0800
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15576 >

editdlg.c tries to edit the pollution of a city.  This is impossible 
(it's not sent to the server) as pollution is determined in city_refresh 
based on the amount of shields and other effects.

This patch removes it.

-jason

Index: client/gui-gtk-2.0/editdlg.c
===================================================================
--- client/gui-gtk-2.0/editdlg.c        (revision 11594)
+++ client/gui-gtk-2.0/editdlg.c        (working copy)
@@ -56,7 +56,6 @@
   CPARAM_SIZE,
   CPARAM_FOOD,
   CPARAM_SHIELDS,
-  CPARAM_POLLUTION,
   CPARAM_LAST
 };
 
@@ -247,9 +246,6 @@
   case CPARAM_SHIELDS:
     pcity->shield_stock = gtk_spin_button_get_value_as_int(spinbutton);
     return;
-  case CPARAM_POLLUTION:
-    pcity->pollution = gtk_spin_button_get_value_as_int(spinbutton);
-    return;
   case CPARAM_LAST:
     break;
   }
@@ -387,14 +383,12 @@
   struct city *pcity = editor_get_selected_city();
 
   const char *names[CPARAM_LAST] = { _("Owner"), _("Size"),
-                                    _("Food"), _("Shields"),
-                                    _("Pollution") };
+                                    _("Food"), _("Shields") };
   int inits[CPARAM_LAST][3] = {
     {pcity->owner->player_no, 0, game.info.nplayers - 1},
     {pcity->size, 1, 63},
     {pcity->food_stock, 0, 10000},
     {pcity->shield_stock, 0, 10000},
-    {pcity->pollution, 0, 2000}
   };
 
   vbox = gtk_vbox_new(FALSE, 5);

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#15576) don't try to edit pollution, Jason Short <=