Some extra checks that was missing

git-svn-id: http://oax.googlecode.com/svn/trunk@303 48ef5666-4144-11de-b6cc-f32266f7ba4a
OpenArena · Aug 30, 2012 · 7112385 · 7112385
1 parent 3a473dc
commit 7112385
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/code/cgame/cg_players.c b/code/cgame/cg_players.c
@@ -1459,7 +1459,6 @@ static void CG_PlayerAngles( centity_t *cent, vec3_t legs[3], vec3_t torso[3], v
 	}
 
 	//
-	clientNum = cent->currentState.clientNum;
 	if ( clientNum >= 0 && clientNum < MAX_CLIENTS ) {
 		ci = &cgs.clientinfo[ clientNum ];
 		if ( ci->fixedlegs ) {

diff --git a/code/cgame/cg_snapshot.c b/code/cgame/cg_snapshot.c
@@ -55,7 +55,7 @@ CG_TransitionEntity
 cent->nextState is moved to cent->currentState and events are fired
 ===============
 */
-//unlagged - early transitioning
+//unlagged - early transitioning
 // used to be static, now needed to transition entities from within cg_ents.c
 void CG_TransitionEntity( centity_t *cent ) {
 	cent->currentState = cent->nextState;
@@ -234,12 +234,12 @@ static void CG_SetNextSnap( snapshot_t *snap ) {
 	}
 
 	// if changing follow mode, don't interpolate
-	if ( cg.nextSnap->ps.clientNum != cg.snap->ps.clientNum ) {
+	if ( cg.snap && cg.nextSnap->ps.clientNum != cg.snap->ps.clientNum ) {
 		cg.nextFrameTeleport = qtrue;
 	}
 
 	// if changing server restarts, don't interpolate
-	if ( ( cg.nextSnap->snapFlags ^ cg.snap->snapFlags ) & SNAPFLAG_SERVERCOUNT ) {
+	if ( cg.snap && ( ( cg.nextSnap->snapFlags ^ cg.snap->snapFlags ) & SNAPFLAG_SERVERCOUNT ) ) {
 		cg.nextFrameTeleport = qtrue;
 	}
 

diff --git a/code/cgame/cg_weapons.c b/code/cgame/cg_weapons.c
@@ -3036,14 +3036,14 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
 				}
 			}
 #endif
-		r = rand() & 3;
+		/*r = rand() & 3;
 		if ( r < 2 ) {
 			sfx = cgs.media.sfx_ric1;
 		} else if ( r == 2 ) {
 			sfx = cgs.media.sfx_ric2;
 		} else {
 			sfx = cgs.media.sfx_ric3;
-		}
+		}*/
 
 		radius = 8;
 		break;

diff --git a/code/game/g_combat.c b/code/game/g_combat.c
@@ -474,7 +474,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
 	int			i,counter2;
 	char		*killerName, *obit;
 
-	if ( self->client->ps.pm_type == PM_DEAD ) {
+	if ( !(self->client) || (self->client->ps.pm_type == PM_DEAD) ) {
 		return;
 	}
 

diff --git a/code/game/g_missile.c b/code/game/g_missile.c
@@ -784,7 +784,8 @@ gentity_t *fire_grapple (gentity_t *self, vec3_t start, vec3_t dir) {
 	SnapVector( hook->s.pos.trDelta );			// save net bandwidth
 	VectorCopy (start, hook->r.currentOrigin);
 
-	self->client->hook = hook;
+	if(self->client)
+		self->client->hook = hook;
 
 	return hook;
 }

diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
@@ -1489,7 +1489,7 @@ float Item_Slider_ThumbPosition(itemDef_t *item) {
 		x = item->window.rect.x;
 	}
 
-	if (editDef == NULL && item->cvar) {
+	if ( !editDef || !(item->cvar) ) {
 		return x;
 	}