From 48998ab22fc2b36a7c4a44ce697aa4315ea0be92 Mon Sep 17 00:00:00 2001 From: Tremulous Test Server Date: Thu, 29 Jan 2015 22:09:01 +0000 Subject: Fixed null pointer accesses that caused the game to crash. --- src/game/g_buildable.c | 2 +- src/game/g_combat.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index bf353bf..d855af5 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -2843,7 +2843,7 @@ void HMedistat_Think( gentity_t *self ) } else if( SPAWN_WITH_MEDKIT && !BG_InventoryContainsUpgrade( UP_MEDKIT, player->client->ps.stats ) ) - BG_AddUpgradeToInventory( UP_MEDKIT, self->enemy->client->ps.stats ); + BG_AddUpgradeToInventory( UP_MEDKIT, player->client->ps.stats ); } } } diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 9a7c1d3..b02ac3e 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -187,6 +187,7 @@ float G_CamperRewardBonus( gentity_t *self ) float G_TeamRewardScaleFactor( gentity_t *target ) { if (level.humanRewardKills <= 0.0f || level.alienRewardKills <= 0.0f) return 1.0f; + if( !target->client ) return 1.0f; if( target->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS) { return level.alienRewardKills/level.humanRewardKills; } else if( target->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) { -- cgit