[freeciv-ai] Re: AI Diplomacy 10

["Per I. Mathisen" <per@xxxxxxxxxxx>]

On Fri, 20 Jun 2003, Jordi Negrevernis i Font wrote:
> > Now, when i want to load the attached savegame it says:
> ...
> > 1: Illegal alliance structure detected: Vojislav's alliance to Jaume I
> > reduced to peace treaty.
> ...
> > civserver: sanitycheck.c:240: check_units: Assertion
> > `pplayers_allied(city_owner(pcity), pplayer)' failed.
> > Abortado
...
> > And if you break the alliance, some units may rest in non-allied cities...

On Fri, 20 Jun 2003, Per I. Mathisen wrote:
> This sounds likely to be the problem, yes. We should run resolve stacks
> after breaking up an alliance. I guess we don't in savegame.c. I'll make a
> patch ASAP if this is indeed the case.

As promised, here is the patch to savegame.c:

@@ -732,6 +732,7 @@
               plr->name, aplayer->name);
       plr->diplstates[aplayer->player_no].type = DS_PEACE;
       aplayer->diplstates[plr->player_no].type = DS_PEACE;
+      resolve_unit_stacks(plr, aplayer, FALSE);
     }
   } players_iterate_end;

The patch is a no-brainer, so I'll commit it tomorrow unless there are any
objections.

  - Per