Re: [Freeciv-Dev] bug in freeciv1.8.0 ?

[Nicolas Brunel <brunel@xxxxxxxxxxxxxxxxxxxx>]

On Tue, 13 Apr 1999, Oleg Bulyzhin wrote:

> Hello.
> 
> It seems i found a bug in freeciv 1.8.0 - at least freeciv 1.7.2 behaviour is
> different in same situation.
> I looked through source code and here is result:
>       a) function citizen_happy_units() (in server/cityturn.c) in freeciv
>          version 1.8.0 was overworked since 1.7.2 and give slightly different
>          result. (maybe it's a bugfix ?)
>       
>          Here is difference:
>               Government: Democracy
>               "Happy" wonders: Michelangelo's Chapel
>               City with size 6 support 1 "aggro" unit
>               When you try to convert some workers to Elvises in order to
>               eliminate disorder you'll get:
>                       1.7.2 -- 1 content 5 Elvises
>                       1.8.0 -- 1 unhappy 5 Elvises
I don't think the difference came from citizen_happy_unit.
I'd rather think it's cause by the 2 last ligns of the diff.
@@ -477,26 +486,25 @@
       case G_REPUBLIC:
   pcity->shield_surplus--;
   this_unit->upkeep=1;
-  if (unit_being_aggressive(this_unit)) {
+  if (!orig_suffrage_applies && (unit_being_aggressive(this_unit)
+              || is_field_unit(this_unit))) {


>       b) in function city_refresh() (in server/cityturn.c) function
>          citizen_happy_buildings() called before city_support()...
>          Result: temple,colosseum,cathedral doesn't eliminate unhappiness
>                  caused by "aggro" units.
>          Is it right? I found nothing about that in rules. It's incorrect
>          i guess.
> 
It seems to me that you are rigth.
If I remember well, It was the behaviour in civI.
Can anyone check please ?

Best regards,