From 28b662b440a8158344c0b072cd5324820dde3e02 Mon Sep 17 00:00:00 2001
From: "Tony J. White" <tjw@tjw.org>
Date: Wed, 6 Sep 2006 20:00:54 +0000
Subject: * my patch for bug 2758 neglected to add the new pmext struct into
 the   cgame code causing client crash when pouncing (oops)

---
 src/cgame/cg_local.h   | 1 +
 src/cgame/cg_main.c    | 1 +
 src/cgame/cg_predict.c | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 7beadaac..559eeefe 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -945,6 +945,7 @@ typedef struct
   // prediction state
   qboolean      hyperspace;                         // true if prediction has hit a trigger_teleport
   playerState_t predictedPlayerState;
+  pmoveExt_t    pmext;
   centity_t     predictedPlayerEntity;
   qboolean      validPPS;                           // clear until the first call to CG_PredictPlayerState
   int           predictedErrorTime;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 30eb134a..cf5eeebe 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1713,6 +1713,7 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
   // clear everything
   memset( &cgs, 0, sizeof( cgs ) );
   memset( &cg, 0, sizeof( cg ) );
+  memset( &cg.pmext, 0, sizeof( cg.pmext ) );
   memset( cg_entities, 0, sizeof( cg_entities ) );
 
   cg.clientNum = clientNum;
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 926d9881..a94abf94 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -453,6 +453,7 @@ void CG_PredictPlayerState( void )
 
   // prepare for pmove
   cg_pmove.ps = &cg.predictedPlayerState;
+  cg_pmove.pmext = &cg.pmext;
   cg_pmove.trace = CG_Trace;
   cg_pmove.pointcontents = CG_PointContents;
   cg_pmove.debugLevel = cg_debugMove.integer;
-- 
cgit