[Freeciv-Dev] Re: PATCH: New version of production fix. (PR#694)

[zamar@xxxxxxxxxxxxxxxxxxx (Joona Kiiski)]

>
>On Friday 09 February 2001 11:57, Joona Kiiski wrote:
>> Fixes the production problems mentioned in my earlier message +
>> Fixes the bugs Thue mentioned in my patch
>>
>> Changes:
>> - Fixed prototype for nullify_caravan_and_disband_plus()
>> (What a silly mistake :)
>>
>> -AI now uses server's disband functions.
>> Those functions modified a bit.
>>
>> -Added new function nullify_prechange_production, which calls
>> nullify_caravan_and_disband_plus (static). Cosmetic change.
>> Should make things a bit less complicated.
>>
>> -Added enum for unit/wonder/building stuff.
>>
>> --
>> Zamar
>
>1) Why this change?
>
>@@ -1321,7 +1327,8 @@
>       pcity->name,get_impr_name_ex(pcity, pcity->currently_building));
>       return 1;
>     }
>-    if (pcity->shield_stock>=improvement_value(pcity->currently_building)) {
>+    if (pcity->before_change_shields>=
>+                  improvement_value(pcity->currently_building)) {
>       if (pcity->currently_building==B_PALACE) {
>       city_list_iterate(pplayer->cities, palace) 
>         if (city_got_building(palace, B_PALACE)) {
>

You're right, it's totally unnecessary, but doesn't do any harm.
(I made it in the beginning when I planned to do
 the patch in different way...)
I'll remove those.

>2) And the last changed year is buggy; after people start building spaceships 
>the year interval change, and so you cannot determine if the year in the 
>last_changed paragraph was the year just before this one. I think you only 
>need to know if the production was changed this turn, ie a boolean.

I didn't change the way it was made...if you browse the current source,
it is also buggy. (I agree that boolean is enough)
I wanted to remove that stupid variable, but then
I understood that it is necessary to save even some kind of compatibility
between 1.11.4-client and 1.11.5-server.

>3) it seems to me that most of the production ETA times in the client are "1 
>turn" (try clicking on the city itself in the city window to refresh it.)
>

I didn't notice that, perhaps it is caunted in some strange way...
I'll check that.

>-Thue
>

--
Zamar

--