Avoid seqno mismatch oops in recursive land unit supply

Before s_commod() attempts to recursively supply a supply unit it
wants to use as supply source, it zaps the unit's load.  When
actually_doit is false, it later restores the old load by overwriting
the change with a saved copy of the unit.  That triggers a seqno
mismatch oops.

Avoid that by copying the new sequence number to the saved copy.
(cherry picked from commit aacd0fb754ef060af92bb08907c5cda196bf34e3)

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 1aa46b474b2520ba6707885809d11b1a66aa077d..ed5ae76917b34b16037dc223f7147ffed7cf5e63 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -361,6 +361,7 @@ s_commod(int own, int x, int y, i_type type, int total_wanted,
            save = land;
            land.lnd_item[type] = 0;
            putland(land.lnd_uid, &land);
+           save.lnd_seqno = land.lnd_seqno;
 
            land.lnd_item[type] =
                save.lnd_item[type] + s_commod(own, land.lnd_x, land.lnd_y,