Random bug fixes

3 files changed, 11 insertions, 5 deletions

diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index 4a73d643..5f87e2d0 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -652,7 +652,7 @@ static void CG_TorchLight( centity_t *cent )
   VectorSubtract( tr.endpos, from, length );
   veclength = VectorLength( length );
 
-  trap_R_AddLightToScene( tr.endpos, 200, 0.0, 0.0, 1.0 );
+  trap_R_AddLightToScene( tr.endpos, 200, 1.0, 1.0, 1.0 );
   
 /*  size = veclength / 2.0f;
   if( size > 255 ) size = 255;
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 33f644d3..24a8f2df 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -548,18 +548,23 @@ void useBody( gentity_t *self, gentity_t *other, gentity_t *activator )
   
   if( activator->client->ps.stats[ STAT_PTEAM ] == PTE_DROIDS )
   {
+    //can't pick teammates bodies to bits
+    if( !Q_stricmp( self->classname, "droidCorpse" ) ) return;
+
     G_AddPredictableEvent( activator, EV_MENU, MN_D_INFEST );
   }
   else
   {
     clientNum = activator->client->ps.clientNum;
+    numerator = self->credits[ clientNum ];
+    class = self->s.clientNum;
     
+    //can't pick teammates bodies to bits
+    if( !Q_stricmp( self->classname, "humanCorpse" ) ) return;
+
     //client has already raided this corpse
     if( self->creditsHash[ clientNum ] ) return;
     
-    numerator = self->credits[ clientNum ];
-    class = self->s.clientNum;
-    
     //total up all the damage done by every client
     for( i = 0; i < MAX_CLIENTS; i++ )
       total += self->credits[ i ];
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 12953de0..8532e4c4 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -219,7 +219,8 @@ void body_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int d
     return;
   }
 
-  GibEntity( self, 0 );
+  //TA: no gibbing
+  //GibEntity( self, 0 );
 }