Freeciv

Better to store time since turn start than remaining time, for handling later changes to timeout setting correctly. This includes the case where there was no timeout set before saving, but it gets set after savegame has been loaded.

Marko Lindqvist wrote:

Untested patch for value loading + using part

Andreas, can you test if it works?

I tried applying the patch to Freeciv-web, but the patching failed.
This was rejected:

if (game.server.phase_timer != NULL) {
     secfile_insert_int(saving->file,
-                       timer_read_seconds(game.server.phase_timer),
+                       timer_read_seconds(game.server.phase_timer)
+                       + game.server.additional_phase_seconds,
                        "game.phase_seconds");
   }

I'm currently on vacation, so I will not be able to do any actions on this. Any help with this would be much appreciated.

Andreas Røsdal wrote:

I tried applying the patch to Freeciv-web, but the patching failed.

First patch/part is already in. Maybe you tried to reapply it?

I suggest that you please commit this to git, and I will test it once it is there. It seems likely to work, and took some effort to test. Thanks for fixing this.

So I guess this has to wait until I have time to setup some basic testing to know it doesn't break anything.

I think this works OK now.