[Freeciv-Dev] Re: (PR#6985) increased cityfactor shown in happiness tab

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

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

On Sat, Nov 29, 2003 at 05:01:02AM -0800, Genevieve Gracian wrote:
> 
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=6985 >
> 
> Under republic, in happiness tab of city dialog (gtk, gtk2), the
> threshold for increasing unhappiness is 269 cities. That seems logical
> since it's 266 under despotism. 
> 
> :-)
> 
> Under democracy, the correct number (full cityfactor, 14 by default) is
> printed. I suspect there is a 256 somewhere who has decided to incite
> players to trouble ...
> 
> This doesn't affect the normal behaviour of a city with civil disorder,
> just bad information is shown.
> 
> cvs head 29 nov 2003

Does this patch solves the problem?

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 Windows: Where do you want to go today?
 Linux: Where do you want to go tomorrow?
 BSD: Are you guys coming or what?

Index: common/packets.def
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.def,v
retrieving revision 1.2
diff -u -u -r1.2 packets.def
--- common/packets.def  2003/11/29 11:53:13     1.2
+++ common/packets.def  2003/11/29 13:24:37
@@ -971,7 +971,7 @@
   UINT8 civil_war;
   UINT8 martial_law_max;
   UINT8 martial_law_per;
-  UINT8 empire_size_mod;
+  SINT8 empire_size_mod;
   UINT8 empire_size_inc;
   UINT8 rapture_size;
       
Index: common/packets_gen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets_gen.c,v
retrieving revision 1.1
diff -u -u -r1.1 packets_gen.c
--- common/packets_gen.c        2003/11/28 17:37:21     1.1
+++ common/packets_gen.c        2003/11/29 13:24:40
@@ -19120,7 +19120,7 @@
     dio_get_uint8(&din, (int *) &real_packet->martial_law_per);
   }
   if (BV_ISSET(fields, 6)) {
-    dio_get_uint8(&din, (int *) &real_packet->empire_size_mod);
+    dio_get_sint8(&din, (int *) &real_packet->empire_size_mod);
   }
   if (BV_ISSET(fields, 7)) {
     dio_get_uint8(&din, (int *) &real_packet->empire_size_inc);
@@ -19496,7 +19496,7 @@
     dio_put_uint8(&dout, real_packet->martial_law_per);
   }
   if (BV_ISSET(fields, 6)) {
-    dio_put_uint8(&dout, real_packet->empire_size_mod);
+    dio_put_sint8(&dout, real_packet->empire_size_mod);
   }
   if (BV_ISSET(fields, 7)) {
     dio_put_uint8(&dout, real_packet->empire_size_inc);