summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_buildable.c2
-rw-r--r--src/game/g_client.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 53f42ea2..a6cf9492 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2162,7 +2162,7 @@ gentity_t *G_buildItem( gentity_t *builder, buildable_t buildable, vec3_t origin
built->physicsBounce = BG_FindBounceForBuildable( buildable );
built->s.groundEntityNum = -1;
- if( builder->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBING )
+ if( builder->client && builder->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBING )
{
if( builder->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING )
VectorSet( normal, 0.0f, 0.0f, -1.0f );
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 8f6678a5..4bb75029 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1535,7 +1535,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn )
AngleVectors( spawn_angles, forward, NULL, NULL );
VectorScale( forward, F_VEL, forward );
- VectorAdd( spawn->s.origin2, forward, dir );
+ VectorAdd( spawnPoint->s.origin2, forward, dir );
VectorNormalize( dir );
VectorScale( dir, UP_VEL, client->ps.velocity );