diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 11:57:30 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:32 +0000 |
| commit | ac1c165d0b8ac4cde29c798413054f246e4ba5ae (patch) | |
| tree | fb33f1e1ffa294345adc4ee3e11ae397c5bfd69b /src/qcommon | |
| parent | 967f52dd997c56c11269ff8b86e95e23f620acb4 (diff) | |
* add cg_unlagged to allow clients to disable backward reconcilliation for their own attacks only
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/q_shared.h | 5 |
1 files changed, 0 insertions, 5 deletions
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 |