[Freeciv-Dev] Re: Multiple patches

[Jeff Mallatt <jjm@xxxxxxxxxxxx>]

At 2000/05/25 21:30 , Robert Rendell wrote:
>
>timeout.diff
>
>    This patch does a number of things WRT timeouts
>       * Fixes a bug which made the turn end immediately when a timeout
>               was first set
>       * When you set the timeout, it applies to the current turn, and the
>               updated timeout info is sent to the clients.
>       * timeouts can be much longer, and will come up in the clients in
>               minutes or hours rather than seconds if appropriate.
>       * A new option, "fixedlength", is available at the server.  If set
>               to 1, turns always run for the full length of the timeout,
>               irresepective of players hitting "Turn Done" (if no timeout
>               is set, fixedlength has no effect).
>
>    Requires that the patch "mixed.diff" also be applied.
>

Attached is an updated patch which:

- Is one patch (doesn't require mixed.diff).

- Adds saving/loading of the "fixedlength" option in the save-file.

- Changes format_duration() to never return more than 3 characters.

Also, I noticed that it was possible for the client to see a negative value
for seconds_to_turndone.  I added a hack to format_duration() so that
negative values are displayed as "0", but I'm wondering if all of the rest
of the client code can handle these negative values (it does seem to work,
but I haven't tested extensively).  To get a negative value (for a moment)
set timeout to 30, wait 15 seconds, then set timeout to 10.

timeout-4.diff
Description: Text document

jjm