Update copyright notice.

[empserver] / src / lib / commands / move.c

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 92dbfbd5e49a2246755dce80e035c37ae2e5ae78..4fabbe9b76db7be6604fe232feba8aef3a917d3b 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -61,11 +61,9 @@ move(void)
     int left;
     int mcost, dam;
     int infected;
-    int stype;
     int vtype;
     int amt_src;
     int amt_dst;
-    struct dchrstr *dp;
     struct ichrstr *ip;
     int work;
     int loyal;
@@ -100,8 +98,6 @@ move(void)
            return RET_FAIL;
        }
     }
-    stype = sect.sct_type;
-    dp = &dchr[stype];
     infected = sect.sct_pstage == PLG_INFECT;
     amt_src = sect.sct_item[vtype];
     if (!istest && amt_src <= 0) {
@@ -155,10 +151,8 @@ move(void)
 
     if (amount <= 0)
        return RET_SYN;
-    packing = ip->i_pkg[dp->d_pkg];
-    if (packing > 1 && sect.sct_effic < 60)
-       packing = 1;
-    weight = (double)amount *ip->i_lbs / packing;
+    packing = sect.sct_effic >= 60 ? dchr[sect.sct_type].d_pkg : IPKG;
+    weight = (double)amount * ip->i_lbs / ip->i_pkg[packing];
     /*
      * First remove commodities from source sector
      */