Generation numbers to catch write back of stale copies

[empserver] / src / lib / update / sail.c

diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index eb0d3931a7cab388d7445a9db43fd975df5976cd..a52408333188a09f82dfc66590beeb8a62b2a2f1 100644 (file)
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  sail.c: Sail ships during the update
- * 
+ *
  *  Known contributors to this file:
  *     Doug Hay
  *     Robert Forsman
@@ -43,6 +43,27 @@
 #include "empobj.h"
 #include "unit.h"
 
+struct fltelemstr {
+    int num;
+    int own;
+    double mobil, mobcost;
+    struct fltelemstr *next;
+};
+
+struct fltheadstr {
+    int leader;
+    signed char real_q;
+/* defines for the real_q member */
+#define        LEADER_VIRTUAL  0
+#define        LEADER_REAL     1
+#define        LEADER_WRONGSECT        2
+    coord x, y;
+    natid own;
+    unsigned maxmoves;
+    struct fltelemstr *head;
+    struct fltheadstr *next;
+};
+
 static void fltp_to_list(struct fltheadstr *, struct emp_qelem *);
 
 static void
@@ -251,7 +272,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
            fltp->maxmoves = 1;
        --fltp->maxmoves;
     }
-    shp_put(&ship_list, own);
+    unit_put(&ship_list, own);
     getship(sp->shp_uid, &ship);
     fltp->x = ship.shp_x;
     fltp->y = ship.shp_y;
@@ -278,7 +299,7 @@ void
 sail_ship(natid cn)
 {
     struct shpstr *sp;
-    struct fltheadstr *head = 0;
+    struct fltheadstr *head = NULL;
     struct fltheadstr *fltp;
     int n;
 
@@ -296,11 +317,11 @@ sail_ship(natid cn)
     }
 
     /* Free up the memory, 'cause I want to. */
-    for (fltp = head; fltp != 0;) {
+    for (fltp = head; fltp;) {
        struct fltelemstr *fe;
        struct fltheadstr *saveh;
        saveh = fltp->next;
-       for (fe = fltp->head; fe != 0;) {
+       for (fe = fltp->head; fe;) {
            struct fltelemstr *saveel;
            saveel = fe->next;
            free(fe);
@@ -326,6 +347,7 @@ fltp_to_list(struct fltheadstr *fltp, struct emp_qelem *list)
        sp = getshipp(fe->num);
        mlp->chrp = (struct empobj_chr *)(mchr + sp->shp_type);
        mlp->unit.ship = *sp;
+       ef_mark_fresh(EF_SHIP, &mlp->unit.ship);
        mlp->mobil = fe->mobil;
        emp_insque(&mlp->queue, list);
     }