Fix damage blobs appearing in wrong places or not appearing at all.

2 files changed, 5 insertions, 10 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 30e6001..7ca427f 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -3937,26 +3937,23 @@ static void CG_DrawDamageBlobs( void )
 
     Com_sprintf( str, sizeof( str ), "%d", blob->value );
 
-
-#define Vector3Set( v, x, y, z ) ((v)[0]=(x),(v)[1]=(y),(v)[2]=(z))
-
     if( blob->flags & DAMAGE_BLOB_FRIENDLY )
-      Vector3Set( color, 1, 0, 0 );
+      VectorSet( color, 1, 0, 0 );
     else
     {
       if( blob->flags & DAMAGE_BLOB_BUILDABLE )
       {
         if( blob->flags & DAMAGE_BLOB_SPLASH )
-          Vector3Set( color, 1, 0.5, 0 );
+          VectorSet( color, 1, 0.5, 0 );
         else
-          Vector3Set( color, 0.7, 0.7, 0.7 );
+          VectorSet( color, 0.7, 0.7, 0.7 );
       }
       else
       {
         if( blob->flags & DAMAGE_BLOB_SPLASH )
-          Vector3Set( color, 1, 1, 0 );
+          VectorSet( color, 1, 1, 0 );
         else
-          Vector3Set( color, 1, 1, 1 );
+          VectorSet( color, 1, 1, 1 );
       }
     }
 
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 891c3e0..d8a9323 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -1350,8 +1350,6 @@ static void CG_DamageBlob_f( void )
     flags = atoi( CG_Argv( i + 4 ) );
 
     CG_SpawnDamageBlob( origin, value, flags );
-    
-    i += 5;
   }
 }