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 f49c2643e9fb6699e7d6feb687a2e99ffa859c54..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-2008, 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
@@ -66,7 +66,10 @@ scuttle_it(struct shpstr *sp)
     }
     wu(0, sp->shp_own, "Scuttling %s in sector %s\n",
        prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
-    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
@@ -139,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,7 +162,7 @@ nav_loadship(struct shpstr *sp, natid cnum)
 
     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) {
@@ -225,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
@@ -234,8 +237,8 @@ nav_load_ship_at_sea(struct shpstr *sp)
  * the ship gets sunk (forts,ect..), the ship hits a mine.
  *
  * 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
@@ -252,24 +255,20 @@ 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 0;
 
-    cnum = sp->shp_own;
-
     /* 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))) {
@@ -281,8 +280,8 @@ nav_ship(struct shpstr *sp)
            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);
@@ -314,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;
        }