Make struct sctstr member sct_effic signed

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

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index e6c47fe98b04d15fda5dfe7ee3e523de3d4fe98c..5d9c767ac5ba40d5879b54ba64062d11e0af4b57 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -31,8 +31,8 @@
  *     David Muir Sharnoff
  *     Chad Zabel, 1994
  *     Steve McClure, 1998-2000
- *     Ron Koenderink, 2003-2004
- *     Markus Armbruster, 2003-2008
+ *     Ron Koenderink, 2003-2009
+ *     Markus Armbruster, 2003-2009
  */
 
 #include <config.h>
@@ -85,9 +85,10 @@ edit(void)
     char buf[1024];
     char ewhat;
 
-    if ((what = getstarg(player->argp[1],
-                        "Edit What (country, land, ship, plane, nuke, unit)? ",
-                        buf)) == 0)
+    what = getstarg(player->argp[1],
+                   "Edit What (country, land, ship, plane, nuke, unit)? ",
+                   buf);
+    if (!what)
        return RET_SYN;
     ewhat = what[0];
     switch (ewhat) {
@@ -129,7 +130,7 @@ edit(void)
        pr("huh?\n");
        return RET_SYN;
     }
-    if (player->argp[3] == 0) {
+    if (!player->argp[3]) {
        switch (ewhat) {
        case 'l':
            prsect(&sect);
@@ -149,8 +150,8 @@ edit(void)
        }
     }
     for (;;) {
-       if (player->argp[arg_index] != 0) {
-           if (player->argp[arg_index+1] != 0) {
+       if (player->argp[arg_index]) {
+           if (player->argp[arg_index+1]) {
                thing = player->argp[arg_index++][0];
                ptr = player->argp[arg_index++];
                arg = atoi(ptr);
@@ -347,7 +348,6 @@ pr_land(struct lndstr *land)
     pr("Fortification <F>: %d\t", land->lnd_harden);
     pr("Land unit <Y>: %d\n", land->lnd_land);
     pr("Ship <S>: %d\t\t", land->lnd_ship);
-    pr("Radius <P>: %d\n", land->lnd_rad_max);
     pr("Retreat percentage <Z>: %d\n", land->lnd_retreat);
     pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
        land->lnd_rpath, land->lnd_rflags);
@@ -374,7 +374,7 @@ pr_ship(struct shpstr *ship)
 {
     struct natstr *natp;
 
-    if ((natp = getnatp(ship->shp_own)) == 0)
+    if (!(natp = getnatp(ship->shp_own)))
        return;
     pr("%s (#%d) %s\n", natp->nat_cnam, ship->shp_own, prship(ship));
     pr("UID <U>: %d\n", ship->shp_uid);
@@ -487,7 +487,7 @@ doland(char op, int arg, char *p, struct sctstr *sect)
     case 'e':
        new = errcheck(arg, 0, 100);
        noise(sect, "Efficiency", sect->sct_effic, new);
-       sect->sct_effic = (unsigned char)new;
+       sect->sct_effic = new;
        break;
     case 'm':
        new = errcheck(arg, -127, 255);
@@ -656,8 +656,10 @@ docountry(char op, int arg, char *p, struct natstr *np)
 
     switch (op) {
     case 'n':
+       if (!check_nat_name(p))
+           return RET_SYN;
        pr("Country name changed from %s to %s\n", np->nat_cnam, p);
-       strncpy(np->nat_cnam, p, sizeof(np->nat_cnam) - 1);
+       strcpy(np->nat_cnam, p);
        break;
     case 'r':
        pr("Country representative changed from %s to %s\n",
@@ -915,7 +917,7 @@ dounit(char op, int arg, char *p, struct lndstr *land)
        land->lnd_ship = arg;
        break;
     case 'P':
-       land->lnd_rad_max = arg;
+       warn_deprecated(op);
        break;
     case 'Z':
        land->lnd_retreat = arg;
@@ -973,7 +975,7 @@ dounit(char op, int arg, char *p, struct lndstr *land)
 }
 
 
-int
+static int
 doplane(char op, int arg, char *p, struct plnstr *plane)
 {
     coord newx, newy;