Fix trailing whitespace

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

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 6c972cf6e3155774ab0aecaad1a85f5ad9661ba6..b62d97abed52c9c26dc3b39933ed56c869759333 100644 (file)
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,14 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  setres.c: Set resources of a sector
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Karl Hagen
@@ -35,15 +35,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*
@@ -53,11 +44,11 @@ int
 setres(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((what = getstarg(player->argp[1],
                         "Set What (iron, gold, oil, uranium, fertility)? ",
@@ -79,7 +70,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Iron ore content",
                         (int)sect.sct_min, amt);
-           sect.sct_min = (u_char)amt;
+           sect.sct_min = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -98,7 +89,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Gold content",
                         (int)sect.sct_gmin, amt);
-           sect.sct_gmin = (u_char)amt;
+           sect.sct_gmin = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -116,7 +107,7 @@ setres(void)
                amt = 0;
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Oil content", (int)sect.sct_oil, amt);
-           sect.sct_oil = (u_char)amt;
+           sect.sct_oil = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -135,7 +126,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Fertility content",
                         (int)sect.sct_fertil, amt);
-           sect.sct_fertil = (u_char)amt;
+           sect.sct_fertil = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -154,7 +145,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Uranium content",
                         (int)sect.sct_uran, amt);
-           sect.sct_uran = (u_char)amt;
+           sect.sct_uran = (unsigned char)amt;
            putsect(&sect);
        }
        break;