commit a1c823693b136d4534a4dec4307a27411a37dd4a
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Oct 13 19:43:47 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Thu Oct 13 19:43:47 2011 +0000
Remove d_net.h, include d_loop.h instead. Remove duplicate definitions
that are in d_loop.h.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2415
---
src/doom/Makefile.am | 2 +-
src/doom/d_net.h | 34 ----------------------------------
src/doom/doomstat.h | 10 +---------
src/doom/r_main.c | 2 +-
4 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
index 596e42eb..f0938c7e 100644
--- a/src/doom/Makefile.am
+++ b/src/doom/Makefile.am
@@ -7,7 +7,7 @@ am_map.c am_map.h \
d_englsh.h \
d_items.c d_items.h \
d_main.c d_main.h \
-d_net.c d_net.h \
+d_net.c \
doomdata.h \
doomdef.c doomdef.h \
doomstat.c doomstat.h \
diff --git a/src/doom/d_net.h b/src/doom/d_net.h
deleted file mode 100644
index fe64e286..00000000
--- a/src/doom/d_net.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// Networking stuff.
-//
-//-----------------------------------------------------------------------------
-
-
-#ifndef __D_NET__
-#define __D_NET__
-
-#include "d_loop.h"
-
-#endif
-
diff --git a/src/doom/doomstat.h b/src/doom/doomstat.h
index 8b430395..6b7288bd 100644
--- a/src/doom/doomstat.h
+++ b/src/doom/doomstat.h
@@ -36,7 +36,7 @@
// We need globally shared data structures,
// for defining the global state variables.
#include "doomdata.h"
-#include "d_net.h"
+#include "d_loop.h"
// We need the playr data structure as well.
#include "d_player.h"
@@ -227,9 +227,6 @@ extern gamestate_t gamestate;
-extern int gametic;
-
-
// Bookkeeping on players - state.
extern player_t players[MAXPLAYERS];
@@ -292,12 +289,7 @@ extern int skyflatnum;
extern int rndindex;
-extern int maketic;
-extern int nettics[MAXPLAYERS];
-
extern ticcmd_t *netcmds;
-extern int ticdup;
-
#endif
diff --git a/src/doom/r_main.c b/src/doom/r_main.c
index 7ea2a329..5e020d53 100644
--- a/src/doom/r_main.c
+++ b/src/doom/r_main.c
@@ -35,7 +35,7 @@
#include "doomdef.h"
-#include "d_net.h"
+#include "d_loop.h"
#include "m_bbox.h"
#include "m_menu.h"