From ce765250b6265bba27174a2339fd14cea2bb0925 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 27 Feb 2006 21:46:35 +0000
Subject: Fix consistency checks

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 399
---
 src/d_ticcmd.h | 4 ++--
 src/g_game.c   | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h
index 1c41d773..0e20e8fe 100644
--- a/src/d_ticcmd.h
+++ b/src/d_ticcmd.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_ticcmd.h 254 2006-01-05 02:42:58Z fraggle $
+// $Id: d_ticcmd.h 399 2006-02-27 21:46:35Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -42,9 +42,9 @@ typedef struct
     signed char	forwardmove;	// *2048 for move
     signed char	sidemove;	// *2048 for move
     short	angleturn;	// <<16 for angle delta
-    short	consistancy;	// checks for net game
     byte	chatchar;
     byte	buttons;
+    byte        consistancy;	// checks for net game
 } ticcmd_t;
 
 
diff --git a/src/g_game.c b/src/g_game.c
index e929270f..e43a93c1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 378 2006-02-23 19:12:02Z fraggle $
+// $Id: g_game.c 399 2006-02-27 21:46:35Z 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 378 2006-02-23 19:12:02Z fraggle $";
+rcsid[] = "$Id: g_game.c 399 2006-02-27 21:46:35Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -253,7 +253,7 @@ boolean         precache = true;        // if true, load all graphics at start
  
 wbstartstruct_t wminfo;               	// parms for world map / intermission 
  
-short		consistancy[MAXPLAYERS][BACKUPTICS]; 
+byte		consistancy[MAXPLAYERS][BACKUPTICS]; 
  
  
 // 
@@ -850,14 +850,12 @@ void G_Ticker (void)
 			
 	    if (netgame && !netdemo && !(gametic%ticdup) ) 
 	    { 
-                /*
 		if (gametic > BACKUPTICS 
 		    && consistancy[i][buf] != cmd->consistancy) 
 		{ 
 		    I_Error ("consistency failure (%i should be %i)",
 			     cmd->consistancy, consistancy[i][buf]); 
 		} 
-                */
 		if (players[i].mo) 
 		    consistancy[i][buf] = players[i].mo->x; 
 		else 
-- 
cgit v1.2.3