diff options
| author | Tony J. White <tjw@tjw.org> | 2006-09-06 20:00:54 +0000 |
|---|---|---|
| committer | Tony J. White <tjw@tjw.org> | 2006-09-06 20:00:54 +0000 |
| commit | 28b662b440a8158344c0b072cd5324820dde3e02 (patch) | |
| tree | c266fd222ab1a18a3fa6c00212bcda68b62ee7c6 /src | |
| parent | e45d844c819e20d33fa67d58252c34b0774504cb (diff) | |
* my patch for bug 2758 neglected to add the new pmext struct into the
cgame code causing client crash when pouncing (oops)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 1 | ||||
| -rw-r--r-- | src/cgame/cg_predict.c | 1 |
3 files changed, 3 insertions, 0 deletions
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; |