From 859b503bae0c66a843ba83d89224b6cddc28e132 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 2 Mar 2006 00:57:25 +0000
Subject: Remove redundant code, shut up warnings

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 405
---
 src/d_net.c      | 24 +++---------------------
 src/g_game.c     |  5 ++---
 src/net_client.h |  4 +++-
 3 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/d_net.c b/src/d_net.c
index 98e8a2f6..406cf39e 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_net.c 403 2006-03-02 00:03:48Z fraggle $
+// $Id: d_net.c 405 2006-03-02 00:57:25Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -117,7 +117,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_net.c 403 2006-03-02 00:03:48Z fraggle $";
+static const char rcsid[] = "$Id: d_net.c 405 2006-03-02 00:57:25Z fraggle $";
 
 
 #include "d_main.h"
@@ -187,8 +187,7 @@ void NetUpdate (void)
 {
     int             nowtime;
     int             newtics;
-    int				i,j;
-    int				realstart;
+    int				i;
     int				gameticdiv;
     
     // Temporary hack - hook new client/server code into Doom
@@ -344,8 +343,6 @@ void D_CheckNetGame (void)
 //
 void D_QuitNetGame (void)
 {
-    int             i, j;
-	
     if (debugfile)
 	fclose (debugfile);
 
@@ -391,15 +388,11 @@ void TryRunTics (void)
     int		i;
     int		lowtic;
     int		entertic;
-    static int	oldentertics;
-    int		realtics;
     int		availabletics;
     int		counts;
     
     // get real tics		
     entertic = I_GetTime ()/ticdup;
-    realtics = entertic - oldentertics;
-    oldentertics = entertic;
     
     // get available tics
     NetUpdate ();
@@ -409,23 +402,12 @@ void TryRunTics (void)
     availabletics = lowtic - gametic/ticdup;
     
     // decide how many tics to run
-    if (realtics < availabletics-1)
-	counts = realtics+1;
-    else if (realtics < availabletics)
-	counts = realtics;
-    else
-	counts = availabletics;
     
     counts = availabletics;
 
     if (counts < 1)
 	counts = 1;
 		
-    if (debugfile)
-	fprintf (debugfile,
-		 "=======real: %i  avail: %i  game: %i\n",
-		 realtics, availabletics,counts);
-	
     // wait for new tics if needed
     while (lowtic < gametic/ticdup + counts)	
     {
diff --git a/src/g_game.c b/src/g_game.c
index eda5c283..e6c24f00 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 402 2006-03-01 23:36:44Z fraggle $
+// $Id: g_game.c 405 2006-03-02 00:57:25Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -134,7 +134,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 402 2006-03-01 23:36:44Z fraggle $";
+rcsid[] = "$Id: g_game.c 405 2006-03-02 00:57:25Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -1446,7 +1446,6 @@ void G_DoSaveGame (void)
 { 
     char	name[100]; 
     char*	description; 
-    unsigned long length;
 	
     strcpy(name, P_SaveGameFile(savegameslot));
 
diff --git a/src/net_client.h b/src/net_client.h
index 85eb595d..8e870467 100644
--- a/src/net_client.h
+++ b/src/net_client.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_client.h 284 2006-01-12 02:11:52Z fraggle $
+// $Id: net_client.h 405 2006-03-02 00:57:25Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -69,6 +69,7 @@
 
 #include "doomdef.h"
 #include "doomtype.h"
+#include "d_ticcmd.h"
 #include "net_defs.h"
 
 #define MAXPLAYERNAME 30
@@ -78,6 +79,7 @@ void NET_CL_Disconnect(void);
 void NET_CL_Run(void);
 void NET_CL_Init(void);
 void NET_CL_StartGame();
+void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic);
 void NET_Init(void);
 
 extern boolean net_client_connected;
-- 
cgit v1.2.3