summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2005-06-26 21:03:43 +0000
committerTim Angus <tim@ngus.net>2005-06-26 21:03:43 +0000
commit2225bfe3b44d5f73976cc3aa17e1aa766fc57148 (patch)
treea38afb06d019c4d760805a488cd662c61d871080 /src/cgame
parentf677b381ac8b8c6e46fa02d0a6d71d341c7dd367 (diff)
* Toned done the chaingun a touch
* Inverted the direction in which a player is spawned * Fixed the alien buildable axis explosion bug * Fixed some class name foul ups in the obituaries * Disabled friendly fire by default
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_buildable.c3
-rw-r--r--src/cgame/cg_event.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 9420af94..b027503a 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -79,7 +79,6 @@ Generated a bunch of gibs launching out from a location
void CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir )
{
vec3_t velocity;
- int count;
particleSystem_t *ps;
qhandle_t gibModel;
int i;
@@ -89,7 +88,7 @@ void CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir )
// allow gibs to be turned off for speed
if( cg_gibs.integer )
{
- for( count = 0; count <= 8; count++ )
+ for( i = 1; i <= 8; i++ )
{
velocity[ 0 ] = crandom( ) * GGIB_VELOCITY;
velocity[ 1 ] = crandom( ) * GGIB_VELOCITY;
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 3a1138e6..891e1371 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -264,13 +264,13 @@ static void CG_Obituary( entityState_t *ent )
case MOD_LEVEL2_CLAW:
message = "was clawed by";
Com_sprintf( className, 64, "'s %s",
- BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL3 ) );
+ BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL2 ) );
message2 = className;
break;
case MOD_LEVEL2_ZAP:
message = "was zapped by";
Com_sprintf( className, 64, "'s %s",
- BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL3 ) );
+ BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL2 ) );
message2 = className;
break;
case MOD_LEVEL4_CLAW: