Update copyright notice.

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

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index fb4372a4ef88c8ebf93ea6fe45b84a09a8bc66ef..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;
@@ -94,22 +92,12 @@ move(void)
      * military control necessary to move
      * goodies in occupied territory.
      */
-    if (!istest && sect.sct_oldown != player->cnum && vtype != V_MILIT) {
-       int tot_mil = 0;
-       struct nstr_item ni;
-       struct lndstr land;
-       snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);
-       while (nxtitem(&ni, (s_char *)&land)) {
-           if (land.lnd_own == player->cnum)
-               tot_mil += total_mil(&land);
-       }
-       if ((sect.sct_item[I_MILIT] + tot_mil) * 10 < sect.sct_item[I_CIVIL]) {
+    if (!istest && sect.sct_oldown != player->cnum && vtype != I_MILIT) {
+       if (!military_control(&sect)) {
            pr("Military control required to move goods.\n");
            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) {
@@ -119,7 +107,7 @@ move(void)
     }
     own = sect.sct_own;
     mob = (int)sect.sct_mobil;
-    if (!istest && vtype == V_CIVIL && sect.sct_oldown != own) {
+    if (!istest && vtype == I_CIVIL && sect.sct_oldown != own) {
        pr("You can't move conquered populace!\n");
        return RET_FAIL;
     }
@@ -128,15 +116,13 @@ move(void)
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        return RET_SYN;
     }
-    if (vtype == V_CIVIL) {
-       work = sect.sct_work;
-       if (work != 100)
-           pr("Warning: civil unrest\n");
-       loyal = sect.sct_loyal;
-    } else if (vtype == V_MILIT) {
-       work = 100;
-       loyal = 0;
-    }
+
+    /* only used when moving civs; but prevent spurious compiler warnings */
+    work = sect.sct_work;
+    loyal = sect.sct_loyal;
+    if (vtype == I_CIVIL && work != 100)
+       pr("Warning: civil unrest\n");
+
     if (istest)
        sprintf(prompt, "Number of %s to test move? ", ip->i_name);
     else
@@ -155,7 +141,7 @@ move(void)
        }
     }
 
-    if (!want_to_abandon(&sect, vtype, amount, 0)) {
+    if (!istest && !want_to_abandon(&sect, vtype, amount, 0)) {
        pr("Move cancelled.\n");
        return RET_FAIL;
     }
@@ -165,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
      */
@@ -251,7 +235,7 @@ move(void)
            pr("Somebody has captured that sector!\n");
        getsect(x, y, &sect);
     }
-    if (vtype == V_CIVIL && sect.sct_item[I_CIVIL]
+    if (vtype == I_CIVIL && sect.sct_item[I_CIVIL]
        && sect.sct_oldown != player->cnum) {
        pr("Your civilians don't want to stay!\n");
        getsect(x, y, &sect);
@@ -269,6 +253,13 @@ move(void)
        pr("%d mob left in %s\n", left,
           xyas(start.sct_x, start.sct_y, player->cnum));
 
+    if (amount <= 0) {
+       getsect(x, y, &start);
+       start.sct_flags &= ~MOVE_IN_PROGRESS;
+       putsect(&start);
+       return RET_OK;
+    }
+
 /* If the sector that things are going to is no longer
    owned by the player, and was the starting sector,
    try to find somewhere to dump the stuff.  If nowhere
@@ -323,7 +314,7 @@ move(void)
      */
     if (infected && sect.sct_pstage == PLG_HEALTHY)
        sect.sct_pstage = PLG_EXPOSED;
-    if (vtype == V_CIVIL) {
+    if (vtype == I_CIVIL) {
        sect.sct_loyal
            = (amt_dst * sect.sct_loyal + amount * loyal) / (amt_dst + amount);
        sect.sct_work
@@ -381,16 +372,16 @@ would_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
 {
     int mil, civs, loyalcivs;
 
-    if ((vtype != V_CIVIL) && (vtype != V_MILIT))
+    if ((vtype != I_CIVIL) && (vtype != I_MILIT))
        return 0;
 
     mil = sp->sct_item[I_MILIT];
     civs = sp->sct_item[I_CIVIL];
 
-    if (vtype == V_MILIT)
+    if (vtype == I_MILIT)
        mil -= amnt;
 
-    if (vtype == V_CIVIL)
+    if (vtype == I_CIVIL)
        civs -= amnt;
 
     if (sp->sct_own == sp->sct_oldown)