commands: Rename the command functions

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

diff --git a/src/lib/commands/stre.c b/src/lib/commands/stre.c
index 20a96083f623c3197e535987dfa775945a49185f..ccd625730e52cf4b9928d27028adc5c77c64644d 100644 (file)
--- a/src/lib/commands/stre.c
+++ b/src/lib/commands/stre.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -29,6 +28,7 @@
  *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
@@ -36,14 +36,13 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "path.h"
 #include "ship.h"
 
 static double units_in_sector(struct combat *def);
 static void stre_hdr(void);
 
 int
-stre(void)
+c_strength(void)
 {
     struct sctstr sect;
     int nsect = 0;
@@ -64,7 +63,7 @@ stre(void)
            stre_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        pr("%4d%%", sect.sct_effic);
        def->x = nstr.x;
@@ -82,17 +81,17 @@ stre(void)
            pr("%7s", "");
 
        if (def->sct_type != SCT_MOUNT)
-           r_total = att_reacting_units(def, 0, 0, &dummy, 9999999);
+           r_total = att_reacting_units(def, NULL, 0, &dummy, 9999999);
        else
            r_total = 0.0;
        def->own = 0;
        eff = att_combat_eff(def);
        if (sect.sct_own == sect.sct_oldown || player->god) {
-           if (sect.sct_mines > 0)
+           if (SCT_LANDMINES(&sect) > 0) {
                pr("%7d", sect.sct_mines);
-           else
+               eff *= (1.0 + MIN(sect.sct_mines, 20) * 0.02);
+           } else
                pr("%7s", "");
-           eff *= (1.0 + MIN(sect.sct_mines, 20) * 0.02);
        } else {
            pr("%7s", "?");
        }
@@ -135,7 +134,7 @@ units_in_sector(struct combat *def)
            continue;
        if (land.lnd_own != def->own)
            continue;
-       if (land.lnd_ship >= 0)
+       if (land.lnd_ship >= 0 || land.lnd_land >= 0)
            continue;
        d_unit = defense_val(&land);
        if (!lnd_could_be_supplied(&land))