/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, 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,
* 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 <config.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "xy.h"
-#include "file.h"
-#include "nsc.h"
+#include <ctype.h>
#include "commands.h"
static void
-list_realm(natid curr, struct natstr *natp)
+list_realm(int curr, struct natstr *natp)
{
struct realmstr realm;
- struct range abs;
- struct range rel;
- abs.width = 0;
- abs.height = 0;
getrealm(curr, natp->nat_cnum, &realm);
- abs.lx = realm.r_xl;
- abs.hx = realm.r_xh;
- abs.ly = realm.r_yl;
- abs.hy = realm.r_yh;
- xyrelrange(natp, &abs, &rel);
- pr("Realm #%d is %d:%d,%d:%d\n", curr, rel.lx, rel.hx, rel.ly, rel.hy);
-
+ 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
return RET_SYN;
}
}
- if (player->argp[2] == 0) {
+ if (!player->argp[2]) {
while (curr <= lastr) {
list_realm(curr, natp);
curr++;
return RET_SYN;
getrealm(curr, natp->nat_cnum, &realm);
realm.r_xl = abs.lx;
- realm.r_xh = abs.hx - 1;
+ realm.r_xh = abs.hx;
realm.r_yl = abs.ly;
- realm.r_yh = abs.hy - 1;
- realm.r_timestamp = time(NULL);
+ realm.r_yh = abs.hy;
putrealm(&realm);
list_realm(curr, natp);
}