/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
#include <math.h>
#include "nsc.h"
#include "path.h"
-#include "ship.h"
#include "update.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 *);
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;
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;
mlp->mobil = fe->mobil;
emp_insque(&mlp->queue, list);
}