Clean up dead stores

[empserver] / src / lib / subs / retreat.c

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 64acb854918abb637d57ba0278678537cf880204..75c6d984c4e8aeab146c1381d35e2c81e92fe93c 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, 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
@@ -145,7 +145,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
     if (sp->shp_own == 0)
        return 0;
 
-    n = 0;
     if (sp->shp_effic < SHIP_MINEFF) {
        wu(0, sp->shp_own,
           "%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
@@ -267,7 +266,9 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
 
        mines = sect.sct_mines;
        changed = 0;
-       if ((mcp->m_flags & M_SWEEP) && sect.sct_type == SCT_WATER) {
+       if (sect.sct_type != SCT_WATER || mines <= 0)
+           continue;
+       if (mcp->m_flags & M_SWEEP) {
            max = mcp->m_item[I_SHELL];
            shells = sp->shp_item[I_SHELL];
            for (m = 0; mines > 0 && m < 5; m++) {
@@ -281,7 +282,8 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
            if (sect.sct_mines != mines) {
                wu(0, sp->shp_own,
                   "%s cleared %d mine%s in %s while retreating\n",
-                  prship(sp), sect.sct_mines-mines, splur(sect.sct_mines-mines),
+                  prship(sp), sect.sct_mines - mines,
+                  splur(sect.sct_mines - mines),
                   xyas(newx, newy, sp->shp_own));
                sect.sct_mines = mines;
                sp->shp_item[I_SHELL] = shells;
@@ -290,8 +292,7 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
            if (changed)
                writemap(sp->shp_own);
        }
-       if (sect.sct_type == SCT_WATER && mines > 0
-           && chance(DMINE_HITCHANCE(mines))) {
+       if (chance(DMINE_HITCHANCE(mines))) {
            wu(0, sp->shp_own,
               "%s %s,\nand hit a mine in %s while retreating!\n",
               prship(sp), conditions[findcondition(code)].desc[orig],
@@ -403,7 +404,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
     if (lp->lnd_own == 0)
        return 0;
 
-    n = 0;
     if (lp->lnd_effic < LAND_MINEFF) {
        wu(0, lp->lnd_own,
           "%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
@@ -475,9 +475,10 @@ retreat_land1(struct lndstr *lp, char code, int orig)
        if (stopping)
            continue;
 
-       mines = sect.sct_mines;
-       if ((lcp->l_flags & L_ENGINEER) && mines > 0 &&
-           (sect.sct_oldown != lp->lnd_own)) {
+       mines = SCT_LANDMINES(&sect);
+       if (mines <= 0 || sect.sct_oldown == lp->lnd_own)
+           continue;
+       if (lcp->l_flags & L_ENGINEER) {
            max = lcp->l_item[I_SHELL];
            shells = lp->lnd_item[I_SHELL];
            for (m = 0; mines > 0 && m < 5; m++) {
@@ -490,8 +491,7 @@ retreat_land1(struct lndstr *lp, char code, int orig)
            lp->lnd_item[I_SHELL] = shells;
            putsect(&sect);
        }
-       if (mines > 0 && (sect.sct_oldown != lp->lnd_own) &&
-           chance(DMINE_LHITCHANCE(mines))) {
+       if (chance(DMINE_LHITCHANCE(mines))) {
            wu(0, lp->lnd_own,
               "%s %s,\nand hit a mine in %s while retreating!\n",
               prland(lp),