Update copyright notice

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

diff --git a/src/lib/commands/real.c b/src/lib/commands/real.c
index 0a319bd6e33cc4bb83e7904a0f14acd194e93ff8..c1411a68ab1da05fb1fbf30d666a45150196749a 100644 (file)
--- a/src/lib/commands/real.c
+++ b/src/lib/commands/real.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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,54 +14,42 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  real.c: Show or set a realm
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "xy.h"
-#include "file.h"
-#include "nsc.h"
+#include <config.h>
+
+#include <ctype.h>
 #include "commands.h"
 
 static void
 list_realm(int curr, struct natstr *natp)
 {
-    struct boundstr *b;
-    struct range abs;
-    struct range rel;
-
-    abs.width = 0;
-    abs.height = 0;
-    b = &natp->nat_b[curr];
-    abs.lx = b->b_xl;
-    abs.hx = b->b_xh;
-    abs.ly = b->b_yl;
-    abs.hy = b->b_yh;
-    xyrelrange(natp, &abs, &rel);
-    pr("Realm #%d is %d:%d,%d:%d\n", curr, rel.lx, rel.hx, rel.ly, rel.hy);
+    struct realmstr realm;
 
+    getrealm(curr, natp->nat_cnum, &realm);
+    pr("Realm #%d is %d:%d,%d:%d\n", curr,
+       xrel(natp, realm.r_xl), xrel(natp, realm.r_xh),
+       yrel(natp, realm.r_yl), yrel(natp, realm.r_yh));
 }
 
 int
 real(void)
 {
-    register struct boundstr *rp;
+    struct realmstr realm;
     struct natstr *natp;
     int curr;
     int lastr;
@@ -83,7 +71,7 @@ real(void)
            return RET_SYN;
        }
     }
-    if (player->argp[2] == 0) {
+    if (!player->argp[2]) {
        while (curr <= lastr) {
            list_realm(curr, natp);
            curr++;
@@ -95,14 +83,13 @@ real(void)
        abs.height = 0;
        if (!sarg_area(player->argp[2], &abs))
            return RET_SYN;
-       rp = &natp->nat_b[curr];
-       rp->b_xl = abs.lx;
-       rp->b_xh = abs.hx - 1;
-       rp->b_yl = abs.ly;
-       rp->b_yh = abs.hy - 1;
-       natp->nat_b[curr] = *rp;
+       getrealm(curr, natp->nat_cnum, &realm);
+       realm.r_xl = abs.lx;
+       realm.r_xh = abs.hx;
+       realm.r_yl = abs.ly;
+       realm.r_yh = abs.hy;
+       putrealm(&realm);
        list_realm(curr, natp);
-       putnat(natp);
     }
     return RET_OK;
 }