deity.h is redundant, remove it.

include/deity.h

@@ -1,41 +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.
- *
- *  ---
- *
- *  deity.h: Definitions for things associated with deity ownership
- * 
- *  Known contributors to this file:
- *  
- */
-
-#ifndef _DEITY_H_
-#define _DEITY_H_
-
-extern s_char *privname;
-extern s_char *privlog;
-extern int privuid;
-
-#endif /* _DEITY_H_ */

src/lib/commands/bdes.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "path.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "nat.h"
 #include "commands.h"

src/lib/commands/best.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "path.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "nat.h"
 #include "commands.h"

src/lib/commands/budg.c

@@ -44,7 +44,6 @@
 #include "nat.h"
 #include "item.h"
 #include "file.h"
-#include "deity.h"
 #include "ship.h"
 #include "land.h"
 #include "plane.h"

src/lib/commands/buil.c

@@ -46,7 +46,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "treaty.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "optlist.h"

src/lib/commands/buy.c

@@ -42,7 +42,6 @@
 #include "news.h"
 #include "nsc.h"
 #include "item.h"
-#include "deity.h"
 #include "land.h"
 #include "commodity.h"
 #include "plane.h"

src/lib/commands/carg.c

@@ -41,7 +41,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "file.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/cede.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "plane.h"

src/lib/commands/cens.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"

src/lib/commands/chan.c

@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "news.h"
 #include "optlist.h"

src/lib/commands/comm.c

@@ -39,7 +39,6 @@
 #include "nsc.h"
 #include "path.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/coun.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "file.h"
-#include "deity.h"
 #include <fcntl.h>
 #include <ctype.h>
 #include "commands.h"

src/lib/commands/cuto.c

@@ -39,7 +39,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/decl.c

@@ -36,7 +36,6 @@
 #include "nat.h"
 #include "news.h"
 #include "file.h"
-#include "deity.h"
 #include "xy.h"
 #include "nsc.h"
 #include "commands.h"

src/lib/commands/demo.c

@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "deity.h"
 #include "var.h"
 #include "sect.h"
 #include "nat.h"

src/lib/commands/desi.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "path.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "nat.h"
 #include "optlist.h"

src/lib/commands/dump.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"

src/lib/commands/expl.c

@@ -39,7 +39,6 @@
 #include "nsc.h"
 #include "item.h"
 #include "file.h"
-#include "deity.h"
 #include "nat.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/fort.c

@@ -40,7 +40,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/fuel.c

@@ -40,7 +40,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "sect.h"
 #include "optlist.h"

src/lib/commands/give.c

@@ -41,7 +41,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "item.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/grin.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "product.h"
 #include "commands.h"

src/lib/commands/hidd.c

@@ -40,7 +40,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/improve.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "optlist.h"

src/lib/commands/land.c

@@ -39,7 +39,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/ldump.c

@@ -39,7 +39,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "var.h"

src/lib/commands/leve.c

@@ -38,7 +38,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "commands.h"

src/lib/commands/lstat.c

@@ -39,7 +39,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/marc.c

@@ -43,7 +43,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "map.h"
 #include "commands.h"

src/lib/commands/mark.c

@@ -37,7 +37,6 @@
 #include "nat.h"
 #include "var.h"
 #include "item.h"
-#include "deity.h"
 #include "commodity.h"
 #include "player.h"
 #include "file.h"

src/lib/commands/miss.c

@@ -44,7 +44,6 @@
 #include "plane.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "mission.h"

src/lib/commands/mobu.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"

src/lib/commands/mora.c

@@ -39,7 +39,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/move.c

@@ -37,7 +37,6 @@
 #include "sect.h"
 #include "item.h"
 #include "file.h"
-#include "deity.h"
 #include "xy.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/commands/name.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "commands.h"

src/lib/commands/navi.c

@@ -42,7 +42,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "map.h"
 #include "commands.h"

src/lib/commands/ndump.c

@@ -40,7 +40,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/news.c

@@ -38,7 +38,6 @@
 #include "file.h"
 #include "xy.h"
 #include "nsc.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/nuke.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/orde.c

@@ -44,7 +44,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "item.h"
 #include "commands.h"

src/lib/commands/path.c

@@ -42,7 +42,6 @@
 #include "sect.h"
 #include "path.h"
 #include "map.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/payo.c

@@ -39,7 +39,6 @@
 #include "ship.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/pdump.c

@@ -41,7 +41,6 @@
 #include "nuke.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "optlist.h"
 #include "commands.h"
 

src/lib/commands/plan.c

@@ -41,7 +41,6 @@
 #include "nuke.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "optlist.h"
 #include "commands.h"
 

src/lib/commands/powe.c

@@ -44,7 +44,6 @@
 #include "nuke.h"
 #include "power.h"
 #include "item.h"
-#include "deity.h"
 #include "plane.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/pstat.c

@@ -40,7 +40,6 @@
 #include "nuke.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "optlist.h"
 #include "commands.h"
 

src/lib/commands/rang.c

@@ -40,7 +40,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "commands.h"
 
 int

src/lib/commands/rea.c

@@ -43,7 +43,6 @@
 #include "nat.h"
 #include "file.h"
 #include "tel.h"
-#include "deity.h"
 #include "commands.h"
 
 #include <stdio.h>

src/lib/commands/repo.c

@@ -38,7 +38,6 @@
 #include "var.h"
 #include "sect.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/reso.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"

src/lib/commands/retr.c

@@ -43,7 +43,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "commands.h"

src/lib/commands/sabo.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "map.h"
 #include "commands.h"
 */

src/lib/commands/sail.c

@@ -41,7 +41,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/scra.c

@@ -42,7 +42,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/scut.c

@@ -42,7 +42,6 @@
 #include "plane.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/sdump.c

@@ -40,7 +40,6 @@
 #include "ship.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/sect.c

@@ -41,7 +41,6 @@
 #include "nat.h"
 #include "file.h"
 #include "map.h"
-#include "deity.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/shi.c

@@ -40,7 +40,6 @@
 #include "ship.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/show.c

@@ -36,7 +36,6 @@
 #include "player.h"
 #include "nat.h"
 #include "file.h"
-#include "deity.h"
 #include "optlist.h"
 #include "subs.h"
 #include "commands.h"

src/lib/commands/sinf.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"

src/lib/commands/spy.c

@@ -42,7 +42,6 @@
 #include "nsc.h"
 #include "nuke.h"
 #include "news.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "land.h"

src/lib/commands/sstat.c

@@ -39,7 +39,6 @@
 #include "ship.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/star.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "product.h"

src/lib/commands/stop.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "product.h"

src/lib/commands/strv.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include <math.h>

src/lib/commands/supp.c

@@ -39,7 +39,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 

src/lib/commands/surv.c

@@ -37,7 +37,6 @@
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "nat.h"
 #include "map.h"

src/lib/commands/tele.c

@@ -37,7 +37,6 @@
 #include "nat.h"
 #include "tel.h"
 #include "news.h"
-#include "deity.h"
 #include "file.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/commands/trad.c

@@ -45,7 +45,6 @@
 #include "land.h"
 #include "plane.h"
 #include "trade.h"
-#include "deity.h"
 #include "xy.h"
 #include "nsc.h"
 #include "file.h"

src/lib/commands/vers.c

@@ -40,7 +40,6 @@
 #include "gamesdef.h"
 #include "misc.h"
 #include "player.h"
-#include "deity.h"
 #include "nat.h"
 #include "version.h"
 #include "ship.h"

src/lib/commands/work.c

@@ -39,7 +39,6 @@
 #include "land.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "optlist.h"
 #include "commands.h"

src/lib/commands/zdon.c

@@ -54,7 +54,6 @@
 #include "player.h"
 #include "nat.h"
 #include "file.h"
-#include "deity.h"
 #include "empthread.h"
 #include "commands.h"
 #include "optlist.h"

src/lib/common/hours.c

@@ -40,7 +40,6 @@
 #include "tel.h"
 #include "proto.h"
 #include "com.h"
-#include "deity.h"
 #include "keyword.h"
 #include "file.h"
 #include "common.h"

src/lib/common/log.c

@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include "deity.h"
 #include "player.h"
 #include "common.h"
 #include "optlist.h"

src/lib/common/maps.c

@@ -39,7 +39,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "file.h"
-#include "deity.h"
 #include "nat.h"
 #include "map.h"
 #include "ship.h"

src/lib/common/move.c

@@ -37,7 +37,6 @@
 #include "var.h"
 #include "sect.h"
 #include "file.h"
-#include "deity.h"
 #include "path.h"
 #include "nat.h"
 #include "common.h"

src/lib/common/xy.c

@@ -37,7 +37,6 @@
 #include "xy.h"
 #include "nat.h"
 #include "sect.h"
-#include "deity.h"
 #include "file.h"
 #include <stdio.h>
 #include "common.h"

src/lib/player/empdis.c

@@ -40,7 +40,6 @@
 #include "tel.h"
 #include "proto.h"
 #include "com.h"
-#include "deity.h"
 #include "keyword.h"
 #include "file.h"
 #include "empio.h"

src/lib/player/init_nats.c

@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nat.h"
 #include "file.h"
-#include "deity.h"
 #include "optlist.h"
 #include "common.h"
 #include "gen.h"

src/lib/player/player.c

@@ -42,7 +42,6 @@
 #include "com.h"
 #include "nat.h"
 #include "sect.h"
-#include "deity.h"
 #include "file.h"
 #include "proto.h"
 #include "empio.h"

src/lib/subs/bsanct.c

@@ -41,7 +41,6 @@
 #include "news.h"
 #include "path.h"
 #include "file.h"
-#include "deity.h"
 #include "prototypes.h"
 
 void

src/lib/subs/control.c

@@ -43,7 +43,6 @@
 #include "land.h"
 #include "nsc.h"
 #include "item.h"
-#include "deity.h"
 #include "prototypes.h"
 
 /*

src/lib/subs/distrea.c

@@ -35,7 +35,6 @@
 #include "player.h"
 #include "treaty.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "prototypes.h"
 

src/lib/subs/land.c

@@ -39,7 +39,6 @@
 #include "ship.h"
 #include "xy.h"
 #include "nat.h"
-#include "deity.h"
 #include "nsc.h"
 #include "plane.h"
 #include "prototypes.h"

src/lib/subs/lostsub.c

@@ -39,7 +39,6 @@
 #include "ship.h"
 #include "xy.h"
 #include "nat.h"
-#include "deity.h"
 #include "nsc.h"
 #include "plane.h"
 #include "lost.h"

src/lib/subs/mission.c

@@ -44,7 +44,6 @@
 #include "plane.h"
 #include "nat.h"
 #include "nsc.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "mission.h"

src/lib/subs/move.c

@@ -37,7 +37,6 @@
 #include "sect.h"
 #include "item.h"
 #include "file.h"
-#include "deity.h"
 #include "xy.h"
 #include "path.h"
 #include "nat.h"

src/lib/subs/mtch.c

@@ -38,7 +38,6 @@
 #include "misc.h"
 #include "player.h"
 #include "com.h"
-#include "deity.h"
 #include "match.h"
 #include "prototypes.h"
 

src/lib/subs/nreport.c

@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "news.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "empio.h"
 #include <fcntl.h>

src/lib/subs/nuke.c

@@ -41,7 +41,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "prototypes.h"
 
 /*ARGSUSED*/

src/lib/subs/plane.c

@@ -41,7 +41,6 @@
 #include "xy.h"
 #include "file.h"
 #include "nat.h"
-#include "deity.h"
 #include "prototypes.h"
 #include "optlist.h"
 

src/lib/subs/radmap.c

@@ -40,7 +40,6 @@
 #include "plane.h"
 #include "file.h"
 #include "nsc.h"
-#include "deity.h"
 #include "prototypes.h"
 #include "optlist.h"
 

src/lib/subs/retreat.c

@@ -45,7 +45,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "options.h"
 #include "damage.h"

src/lib/subs/sarg.c

@@ -39,7 +39,6 @@
 #include "nsc.h"
 #include "sect.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "prototypes.h"
 #include "optlist.h"

src/lib/subs/sect.c

@@ -38,7 +38,6 @@
 #include "sect.h"
 #include "xy.h"
 #include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "land.h"
 #include "nsc.h"

src/lib/subs/ship.c

@@ -39,7 +39,6 @@
 #include "file.h"
 #include "nat.h"
 #include "ship.h"
-#include "deity.h"
 #include "land.h"
 #include "plane.h"
 #include "nsc.h"

src/lib/subs/supply.c

@@ -42,7 +42,6 @@
 #include "xy.h"
 #include "nsc.h"
 #include "path.h"
-#include "deity.h"
 #include "item.h"
 #include "file.h"
 #include "options.h"

src/lib/update/move_sat.c

@@ -40,7 +40,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "update.h"
 #include "subs.h"

src/lib/update/nav_ship.c

@@ -43,7 +43,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "item.h"
 #include "optlist.h"

src/lib/update/nav_util.c

@@ -45,7 +45,6 @@
 #include "nsc.h"
 #include "nat.h"
 #include "path.h"
-#include "deity.h"
 #include "file.h"
 #include "item.h"
 #include "optlist.h"