From 3db4e34ba40d98b14d9ab04f98c92ffaeecb2800 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 31 Dec 2005 10:50:24 +0000 Subject: [PATCH] (natstr): Members nat_xstart, nat_ystart are used write-only. Remove. Users changed. --- include/nat.h | 1 - src/lib/commands/add.c | 2 -- src/lib/commands/new.c | 4 ++-- src/lib/global/nsc.c | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/nat.h b/include/nat.h index d12ee5ad..7723be8a 100644 --- a/include/nat.h +++ b/include/nat.h @@ -67,7 +67,6 @@ struct natstr { char nat_hostaddr[32]; /* host addr of last user */ char nat_hostname[512]; /* hostname of last user, may be empty */ char nat_userid[32]; /* userid of last user, may be empty */ - coord nat_xstart, nat_ystart; /* cap location at start */ coord nat_xcap, nat_ycap; /* cap location in abs coords */ coord nat_xorg, nat_yorg; /* origin location in abs coords */ s_char nat_dayno; /* day of the year mod 128 */ diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c index 9c9ba4c1..15607343 100644 --- a/src/lib/commands/add.c +++ b/src/lib/commands/add.c @@ -197,8 +197,6 @@ add(void) natp->nat_btu = 0; natp->nat_reserve = 0; natp->nat_tgms = 0; - natp->nat_ystart = 0; - natp->nat_xstart = 0; natp->nat_ycap = 0; natp->nat_xcap = 0; natp->nat_yorg = 0; diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c index 4f491e9a..44c173fb 100644 --- a/src/lib/commands/new.c +++ b/src/lib/commands/new.c @@ -31,6 +31,8 @@ * Dave Pare, 1986 */ +#include + #include "misc.h" #include "player.h" #include "nat.h" @@ -180,8 +182,6 @@ new(void) natp->nat_btu = max_btus; natp->nat_stat &= ~STAT_NEW; natp->nat_stat |= STAT_SANCT; - natp->nat_xstart = x; - natp->nat_ystart = y; natp->nat_xcap = x; natp->nat_ycap = y; natp->nat_xorg = x; diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 5aa0c182..aefe30da 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -491,8 +491,6 @@ struct castr nat_ca[] = { {NSC_STRINGY, 0, 32, fldoff(natstr, nat_hostaddr), "ip", EF_BAD}, {NSC_STRINGY, 0, 512, fldoff(natstr, nat_hostname), "hostname", EF_BAD}, {NSC_STRINGY, 0, 32, fldoff(natstr, nat_userid), "userid", EF_BAD}, - {NSC_XCOORD, 0, 0, fldoff(natstr, nat_xstart), "xstart", EF_BAD}, - {NSC_YCOORD, 0, 0, fldoff(natstr, nat_ystart), "ystart", EF_BAD}, {NSC_XCOORD, 0, 0, fldoff(natstr, nat_xcap), "xcap", EF_BAD}, {NSC_YCOORD, 0, 0, fldoff(natstr, nat_ycap), "ycap", EF_BAD}, {NSC_XCOORD, NSC_DEITY, 0, fldoff(natstr, nat_xorg), "xorg", EF_BAD},