From e14610587a2fd948308fc343c213173ace61116a Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 5 Aug 2005 23:08:05 +0000 Subject: * Fixed a potential bug where build points might not have gotten reset following a map with a custom amount --- src/game/g_spawn.c | 4 ++-- src/game/tremulous.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c index 9a2fa1e9..5e9e6da0 100644 --- a/src/game/g_spawn.c +++ b/src/game/g_spawn.c @@ -617,7 +617,7 @@ void SP_worldspawn( void ) G_SpawnString( "gravity", "800", &s ); trap_Cvar_Set( "g_gravity", s ); - G_SpawnString( "humanBuildPoints", g_humanBuildPoints.string, &s ); + G_SpawnString( "humanBuildPoints", DEFAULT_HUMAN_BUILDPOINTS, &s ); trap_Cvar_Set( "g_humanBuildPoints", s ); G_SpawnString( "humanMaxStage", "2", &s ); @@ -629,7 +629,7 @@ void SP_worldspawn( void ) G_SpawnString( "humanStage3Threshold", g_humanStage3Threshold.string, &s ); trap_Cvar_Set( "g_humanStage3Threshold", s ); - G_SpawnString( "alienBuildPoints", g_alienBuildPoints.string, &s ); + G_SpawnString( "alienBuildPoints", DEFAULT_ALIEN_BUILDPOINTS, &s ); trap_Cvar_Set( "g_alienBuildPoints", s ); G_SpawnString( "alienMaxStage", "2", &s ); diff --git a/src/game/tremulous.h b/src/game/tremulous.h index b75959ca..4d74851d 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -561,3 +561,6 @@ #define FREEKILL_PERIOD 120000 //msec #define FREEKILL_ALIEN 1 #define FREEKILL_HUMAN LEVEL0_VALUE + +#define DEFAULT_ALIEN_BUILDPOINTS "100" +#define DEFAULT_HUMAN_BUILDPOINTS "100" -- cgit