(getvec, putvec): No longer used, remove.

diff --git a/include/prototypes.h b/include/prototypes.h
index 12ab01b6f4a8b616a955f2a80f8cd0a214368c4b..553940feba9b74dd2b9ca994f96f599a9fa3204c 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -116,9 +116,6 @@ extern int fsize(int);
 extern int blksize(int);
 extern time_t fdate(int);
 extern void filetruncate(s_char *);
-/* getvar.c */
-extern int getvec(int, int *, s_char *, int);
-extern int putvec(int, int *, s_char *, int);
 /* hap_fact.c */
 extern double hap_fact(struct natstr *, struct natstr *);
 /* hours.c */

diff --git a/src/lib/common/Makefile b/src/lib/common/Makefile
index a56f7b492a613af53ab6f741f092265df8e4967f..42de25ba3f28b2af2c87d7c48a9f3ce0de221413 100644 (file)
--- a/src/lib/common/Makefile
+++ b/src/lib/common/Makefile
@@ -35,13 +35,13 @@ include ../../make.defs
 LIB = $(SRCDIR)/lib/libcommon.a
 NTLIB = $(SRCDIR)\lib\libcommon.lib
 
-OBJS =  bestpath.o bridgefall.o check.o damage.o file.o fsize.o getvar.o \
+OBJS =  bestpath.o bridgefall.o check.o damage.o file.o fsize.o \
        hap_fact.o hours.o keyword.o land.o log.o mailbox.o maps.o move.o \
        nat.o path.o res_pop.o sectdamage.o \
        stmtch.o tfact.o type.o vlist.o wantupd.o xy.o
 
 NTOBJS = bestpath.obj bridgefall.obj check.obj damage.obj file.obj fsize.obj \
-       getvar.obj hap_fact.obj hours.obj keyword.obj land.obj log.obj \
+       hap_fact.obj hours.obj keyword.obj land.obj log.obj \
        mailbox.obj maps.obj move.obj nat.obj path.obj res_pop.obj \
        sectdamage.obj stmtch.obj tfact.obj \
        type.obj vlist.obj wantupd.obj xy.obj

diff --git a/src/lib/common/getvar.c b/src/lib/common/getvar.c
deleted file mode 100644 (file)
index c1b30ba..0000000
--- a/src/lib/common/getvar.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program 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
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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
- *
- *  ---
- *
- *  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.
- *
- *  ---
- *
- *  getvar.c: Routines for manipulating variable lists.
- * 
- *  Known contributors to this file:
- *     Dave Pare, 1989
- */
-
-#include <limits.h>
-#include "misc.h"
-#include "var.h"
-#include "file.h"
-#include "common.h"
-
-int
-getvec(int class, int *vec, s_char *sp, int ptype)
-{
-    u_short *src = ef_items(ptype, sp);
-    int i;
-
-    if (!src || class != VT_ITEM) {
-       logerror("getvec: ptype %d has no vars", ptype);
-       return 0;
-    }
-
-    for (i = 0; i <= I_MAX; ++i)
-       vec[i] = src[i];
-
-    return I_MAX;
-}
-
-int
-putvec(int class, int *vec, s_char *sp, int ptype)
-{
-    u_short *dst = ef_items(ptype, sp);
-    int i;
-
-    if (!dst || class != VT_ITEM) {
-       logerror("putvec: ptype %d has no vars", ptype);
-       return 0;
-    }
-
-    for (i = 0; i <= I_MAX; ++i) {
-       if (vec[i] < 0) {
-           logerror("putvec: item %d underflow", i);
-           dst[i] = 0;
-       } else if (vec[i] > SHRT_MAX) {
-           logerror("putvec: item %d overflow", i);
-           dst[i] = SHRT_MAX;
-       } else
-           dst[i] = vec[i];
-    }
-
-    return I_MAX;
-}