shithub: choc

Download patch

ref: ce765250b6265bba27174a2339fd14cea2bb0925
parent: 55225853c8a051f6201d9b92bc0fe68ef68bc8be
author: Simon Howard <[email protected]>
date: Mon Feb 27 16:46:35 EST 2006

Fix consistency checks

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 399

--- 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 @@
     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;
 
 
--- 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 @@
  
 wbstartstruct_t wminfo;               	// parms for world map / intermission 
  
-short		consistancy[MAXPLAYERS][BACKUPTICS]; 
+byte		consistancy[MAXPLAYERS][BACKUPTICS]; 
  
  
 // 
@@ -850,7 +850,6 @@
 			
 	    if (netgame && !netdemo && !(gametic%ticdup) ) 
 	    { 
-                /*
 		if (gametic > BACKUPTICS 
 		    && consistancy[i][buf] != cmd->consistancy) 
 		{ 
@@ -857,7 +856,6 @@
 		    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