Drop redundant nav_loadship() parameter cnum

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

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index ba04f74cc7403a3c47593afc85d47dd49b3e331a..b4f5081550aaf38f60e283e559bca344e2614fdc 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.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-2010, 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 @@
  *  ---
  *
  *  nav_ship.c: Navigate ships and such
- * 
+ *
  *  Known contributors to this file:
  *     Chad Zabel, 1994
  *     Ken Stevens, 1995
@@ -53,24 +53,23 @@ scuttle_it(struct shpstr *sp)
           sp->shp_x, sp->shp_y, sp->shp_uid);
        return;
     }
-    if (sectp->sct_type != SCT_HARBR || sectp->sct_effic < 2) {
-       wu(0, sp->shp_own,
-          "%s is not in a harbor at least 2%% eff!  Not scuttling.\n",
-          prship(sp));
-       return;
-    }
     if (opt_TRADESHIPS) {
        if (!(mchr[(int)sp->shp_type].m_flags & M_TRADE)) {
            wu(0, sp->shp_own, "You can only autoscuttle trade ships!\n");
            return;
        }
     }
+    if (!scuttle_tradeship(sp, 0)) {
+       wu(0, sp->shp_own,
+          "%s doesn't pay here!  Not scuttled.\n", prship(sp));
+       return;
+    }
     wu(0, sp->shp_own, "Scuttling %s in sector %s\n",
        prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
-    if (opt_TRADESHIPS) {
-       scuttle_tradeship(sp, 0);
-    }
-    scuttle_ship(sp);
+    if (sectp->sct_own == sp->shp_own)
+       unit_drop_cargo((struct empobj *)sp, sectp->sct_own);
+    sp->shp_effic = 0;
+    putship(sp->shp_uid, sp);
 }
 
 static void
@@ -143,7 +142,7 @@ swap(struct shpstr *sp)
  */
 
 static int
-nav_loadship(struct shpstr *sp, natid cnum)
+nav_loadship(struct shpstr *sp)
 {
     struct sctstr *sectp;
     int i, landown, shipown, didsomething[TMAX], rel;
@@ -159,13 +158,11 @@ nav_loadship(struct shpstr *sp, natid cnum)
     sp->shp_autonav &= ~AN_LOADING;
 
     if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
-       return RET_SYS;         /* safety */
-    /* I suspect RET_SYS isn't really what you want here --dfp */
-
+       return 0;               /* safety */
 
     landown = sectp->sct_own;
     shipown = sp->shp_own;
-    rel = getrel(getnatp(sectp->sct_own), cnum);
+    rel = getrel(getnatp(sectp->sct_own), sp->shp_own);
 
     /* loop through each field for that ship */
     for (i = 0; i < TMAX; ++i) {
@@ -231,7 +228,7 @@ nav_load_ship_at_sea(struct shpstr *sp)
 }
 
 /* new autonav code.
- * 
+ *
  * 1. Try and move to the next sector/harbor given by the player.
  * 2. Once we reach a harbor try and load all cargo holds for that ship.
  * 3. If the ship reaches its max levels set by the player try to use
@@ -239,18 +236,14 @@ nav_load_ship_at_sea(struct shpstr *sp)
  * Continue to loop until the ship runs out of mobility, a load fails,
  * the ship gets sunk (forts,ect..), the ship hits a mine.
  *
- * A check has been added for fuel so ships don't end up running
- * out of mobility in the ocean.
- *
  * Questions, bugs (fixes) , or new ideas should be directed at
- * Chad Zabel.  
- * 6-1-94   
+ * Chad Zabel.
+ * 6-1-94
  * Modified to use shp_nav by Ken Stevens 1995
  */
 int
 nav_ship(struct shpstr *sp)
 {
-    struct sctstr *sectp;
     char *cp;
     int stopping;
     int quit;
@@ -262,45 +255,33 @@ nav_ship(struct shpstr *sp)
     int dummyint;
     double dummydouble;
     int dir;
-    natid cnum;
 
     /* just return if no autonaving to do for this ship */
     if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
-       return RET_OK;
-
-    cnum = sp->shp_own;
+       return 0;
 
     /* Make a list of one ships so we can use the navi.c code */
     emp_initque(&ship_list);
     mlp = malloc(sizeof(struct ulist));
     mlp->chrp = (struct empobj_chr *)(mchr + sp->shp_type);
     mlp->unit.ship = *sp;
+    ef_mark_fresh(EF_SHIP, &mlp->unit.ship);
     mlp->mobil = sp->shp_mobil;
     emp_insque(&mlp->queue, &ship_list);
 
-    quit = 1;                  /* setup loop, we want to check it 1 time. */
-
     do {
        if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
            (!(sp->shp_autonav & AN_STANDBY))) {
            shp_nav(&ship_list, &dummydouble, &dummydouble, &dummyint,
                    sp->shp_own);
            if (QEMPTY(&ship_list))
-               return RET_OK;
-           /* before we move check to see if ship needs fuel. */
-           sectp = getsectp(sp->shp_x, sp->shp_y);
-           if (opt_FUEL &&
-               sectp->sct_own != 0 &&
-               sp->shp_fuel <= 0 &&
-               ((struct mchrstr *)mlp->chrp)->m_fuelu != 0)
-               auto_fuel_ship(sp);
-           mlp->unit.ship.shp_fuel = sp->shp_fuel;
+               return 0;
 
            cp = BestShipPath(buf, sp->shp_x, sp->shp_y,
                              sp->shp_destx[0], sp->shp_desty[0],
                              sp->shp_own);
-           if (cp == 0) {
-               wu(0, cnum,
+           if (!cp) {
+               wu(0, sp->shp_own,
                   "%s bad path, ship put on standby\n", prship(sp));
                sp->shp_autonav |= AN_STANDBY;
                putship(sp->shp_uid, sp);
@@ -313,7 +294,7 @@ nav_ship(struct shpstr *sp)
                    free(qp);
                    qp = newqp;
                }
-               return RET_SYN;
+               return -1;
            }
            stopping = 0;
 
@@ -332,7 +313,7 @@ nav_ship(struct shpstr *sp)
 
        /* Try to load the ship */
        if (sp->shp_autonav & AN_LOADING) {
-           didsomething = nav_loadship(sp, cnum);
+           didsomething = nav_loadship(sp);
            if (didsomething)
                quit = 1;
        }
@@ -353,5 +334,5 @@ nav_ship(struct shpstr *sp)
        free(qp);
        qp = newqp;
     }
-    return RET_OK;
+    return 0;
 }