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 0c4ec54c9c0c610a7f7ea720b3ef655429a49825..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-2006, 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
@@ -36,40 +36,42 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "path.h"
-#include "ship.h"
-#include "file.h"
-#include "nat.h"
-#include "xy.h"
+#include <math.h>
 #include "nsc.h"
+#include "path.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
-#include <math.h>
-#include <stdlib.h>
+#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
 cost_ship(struct shpstr *sp, struct fltelemstr *ep, struct fltheadstr *fp)
 {
-    double mobcost;
+    double mobcost = shp_mobcost(sp);
     int howfar;
 
-    mobcost = 0.0;
-    if (sp->shp_effic > 0) {
-       mobcost = sp->shp_effic * sp->shp_speed * 0.01;
-       mobcost = 480.0 / (mobcost * (1 + (50 + sp->shp_tech) /
-                                     (double)(200 + sp->shp_tech)));
-    }
-/* the next two lines are not necessary since shp_mobquota is unsigned
-and therefore cannot be less than 0. 
-       if (sp->shp_mobquota<0)
-               sp->shp_mobquota=0;
-*/
-
     howfar = 0;
     if (mobcost > 0) {
        howfar = (int)sp->shp_mobil - (int)sp->shp_mobquota;
@@ -82,7 +84,7 @@ and therefore cannot be less than 0.
        "Ship #%d can move %d spaces on mobility %d (cost/sect %f)\n",
        sp->shp_uid, howfar, sp->shp_mobil, mobcost);
 #endif
-    if ((unsigned int)howfar < fp->maxmoves)
+    if ((unsigned)howfar < fp->maxmoves)
        fp->maxmoves = howfar;
 
     ep->mobil = sp->shp_mobil;
@@ -98,7 +100,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
     int len = 0;
     int follow = -1;
     int stop;
-    s_char *cp;
+    char *cp;
 
     if (sp->shp_own == 0)
        return 0;
@@ -211,7 +213,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
     struct shpstr *sp, ship;
     struct sctstr *sectp;
     int error = 0;
-    s_char *s, *p;
+    char *s, *p;
     natid own;
     struct emp_qelem ship_list;
     int dir;
@@ -270,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;
@@ -297,7 +299,7 @@ void
 sail_ship(natid cn)
 {
     struct shpstr *sp;
-    struct fltheadstr *head = 0;
+    struct fltheadstr *head = NULL;
     struct fltheadstr *fltp;
     int n;
 
@@ -315,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);
@@ -336,15 +338,16 @@ static void
 fltp_to_list(struct fltheadstr *fltp, struct emp_qelem *list)
 {
     struct fltelemstr *fe;
-    struct mlist *mlp;
+    struct ulist *mlp;
     struct shpstr *sp;
 
     emp_initque(list);
     for (fe = fltp->head; fe; fe = fe->next) {
-       mlp = malloc(sizeof(struct mlist));
+       mlp = malloc(sizeof(struct ulist));
        sp = getshipp(fe->num);
-       mlp->mcp = mchr + sp->shp_type;
-       mlp->ship = *sp;
+       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);
     }