From ac1c165d0b8ac4cde29c798413054f246e4ba5ae Mon Sep 17 00:00:00 2001 From: Roman Tetelman Date: Sat, 3 Oct 2009 11:57:30 +0000 Subject: * add cg_unlagged to allow clients to disable backward reconcilliation for their own attacks only --- src/qcommon/q_shared.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/qcommon') diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 68fd619a..84408371 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -1039,12 +1039,7 @@ typedef struct { #define MAX_STATS 16 #define MAX_PERSISTANT 16 #define MAX_MISC 16 -<<<<<<< #define MAX_WEAPONS 16 -||||||| -======= -#define MAX_WEAPONS 16 ->>>>>>> #define MAX_PS_EVENTS 2 -- cgit