After changing aliens->droids, changed droids->aliens *sigh*

10 files changed, 72 insertions, 72 deletions

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index e56e62ec..b61735a7 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -394,7 +394,7 @@ void CG_Buildable( centity_t *cent )
     CG_Error( "Bad item index %i on entity", es->modelindex );
   
   //add creep
-  if( es->modelindex2 == BIT_DROIDS )
+  if( es->modelindex2 == BIT_ALIENS )
     CG_Creep( cent );  
 
   // if set to invisible, skip
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 9fbf232b..7aee0784 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -305,7 +305,7 @@ void CG_DrawTeamBackground( int x, int y, int w, int h, float alpha, int team )
     hcolor[0] = 1.0f;
     hcolor[1] = 0.0f;
     hcolor[2] = 0.0f;
-  } else if ( team == TEAM_DROIDS ) {
+  } else if ( team == TEAM_ALIENS ) {
     hcolor[0] = 0.0f;
     hcolor[1] = 0.0f;
     hcolor[2] = 1.0f;
@@ -345,23 +345,23 @@ static void CG_DrawLighting( void )
   {
     default:
 /*      if( lum < 10 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav9 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav9 );
       else if( lum >= 10 && lum < 16 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav8 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav8 );
       else if( lum >= 16 && lum < 22 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav7 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav7 );
       else if( lum >= 22 && lum < 28 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav6 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav6 );
       else if( lum >= 28 && lum < 34 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav5 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav5 );
       else if( lum >= 34 && lum < 40 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav4 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav4 );
       else if( lum >= 40 && lum < 46 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav3 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav3 );
       else if( lum >= 46 && lum < 53 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav2 );
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav2 );
       else if( lum >= 53 )
-        CG_DrawPic( -4, -4, 648, 488, cgs.media.droidNav1 );*/
+        CG_DrawPic( -4, -4, 648, 488, cgs.media.alienNav1 );*/
 
       break;
 
@@ -435,7 +435,7 @@ static void CG_DrawStatusBar( void ) {
   /*if (cg.predictedPlayerState.powerups[PW_REDFLAG])
     CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_HUMANS);
   else if (cg.predictedPlayerState.powerups[PW_BLUEFLAG])
-    CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_DROIDS);*/
+    CG_DrawStatusBarFlag( 185 + CHAR_WIDTH*3 + TEXT_ICON_SPACE + ICON_SIZE, TEAM_ALIENS);*/
 
   /*if ( ps->stats[ STAT_ARMOR ] ) {
     origin[0] = 90;
@@ -564,7 +564,7 @@ static void CG_DrawStatusBar( void ) {
   #define HV_WIDTH  80
   #define HV_X      555
   #define HV_Y      20
-  if( ps->stats[ STAT_PTEAM ] == PTE_DROIDS )
+  if( ps->stats[ STAT_PTEAM ] == PTE_ALIENS )
   {
     float total = cgs.dBuildPointsTotal;
     float allocated = total - cgs.dBuildPoints;
@@ -582,19 +582,19 @@ static void CG_DrawStatusBar( void ) {
   //
   // health+armor
   //
-  if( ps->stats[ STAT_PTEAM ] == PTE_DROIDS )
+  if( ps->stats[ STAT_PTEAM ] == PTE_ALIENS )
   {
     vec4_t fcolor = { 1, 0, 0, 0.5 }; //red half alpha
     vec4_t tcolor = { 0.3, 0.8, 1, 1 }; //cyan no alpha
 
     value = (int)( (float)( (float)ps->stats[STAT_HEALTH] / ps->stats[STAT_MAX_HEALTH] ) * 100 );
 
-    CG_DrawFadePic( 20, 0, 30, 440, fcolor, tcolor, value, cgs.media.droidHealth );
+    CG_DrawFadePic( 20, 0, 30, 440, fcolor, tcolor, value, cgs.media.alienHealth );
 
 /*    value = (int)( (float)( (float)ps->stats[STAT_ARMOR] / ps->stats[STAT_MAX_HEALTH] ) * 100 );
 
     if( value > 0 )
-      CG_DrawFadePic( 580, 0, 30, 440, fcolor, tcolor, value, cgs.media.droidHealth );*/
+      CG_DrawFadePic( 580, 0, 30, 440, fcolor, tcolor, value, cgs.media.alienHealth );*/
   }
   else
   {
@@ -799,7 +799,7 @@ static float CG_DrawTeamOverlay( float y, qboolean right, qboolean upper ) {
   }
 
   if ( cg.snap->ps.persistant[PERS_TEAM] != TEAM_HUMANS &&
-    cg.snap->ps.persistant[PERS_TEAM] != TEAM_DROIDS ) {
+    cg.snap->ps.persistant[PERS_TEAM] != TEAM_ALIENS ) {
     return y; // Not on any team
   }
 
@@ -859,7 +859,7 @@ static float CG_DrawTeamOverlay( float y, qboolean right, qboolean upper ) {
     hcolor[1] = 0;
     hcolor[2] = 0;
     hcolor[3] = 0.33f;
-  } else { // if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_DROIDS )
+  } else { // if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_ALIENS )
     hcolor[0] = 0;
     hcolor[1] = 0;
     hcolor[2] = 1;
@@ -1014,7 +1014,7 @@ static float CG_DrawPoints( float y )
 
   team = cg.snap->ps.stats[ STAT_PTEAM ];
   
-  if( team == PTE_DROIDS )
+  if( team == PTE_ALIENS )
     buildpoints = cgs.dBuildPoints;
   else if( team == PTE_HUMANS )
     buildpoints = cgs.hBuildPoints;
@@ -1081,7 +1081,7 @@ static float CG_DrawScores( float y ) {
     w = CG_DrawStrlen( s ) * BIGCHAR_WIDTH + 8;
     x -= w;
     CG_FillRect( x, y-4,  w, BIGCHAR_HEIGHT+8, color );
-    if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_DROIDS ) {
+    if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_ALIENS ) {
       CG_DrawPic( x, y-4, w, BIGCHAR_HEIGHT+8, cgs.media.selectShader );
     }
     CG_DrawBigString( x + 4, y, s, 1.0F);
@@ -1419,7 +1419,7 @@ static void CG_DrawTeamInfo( void ) {
       hcolor[1] = 0.0f;
       hcolor[2] = 0.0f;
       hcolor[3] = 0.33f;
-    } else if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_DROIDS ) {
+    } else if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_ALIENS ) {
       hcolor[0] = 0.0f;
       hcolor[1] = 0.0f;
       hcolor[2] = 1.0f;
@@ -2031,7 +2031,7 @@ static void CG_DrawTeamVote(void) {
 
   if ( cgs.clientinfo->team == TEAM_HUMANS )
     cs_offset = 0;
-  else if ( cgs.clientinfo->team == TEAM_DROIDS )
+  else if ( cgs.clientinfo->team == TEAM_ALIENS )
     cs_offset = 1;
   else
     return;
diff --git a/src/cgame/cg_drawtools.c b/src/cgame/cg_drawtools.c
index 446018a5..d5a144e6 100644
--- a/src/cgame/cg_drawtools.c
+++ b/src/cgame/cg_drawtools.c
@@ -388,7 +388,7 @@ float *CG_TeamColor( int team ) {
   switch ( team ) {
   case TEAM_HUMANS:
     return red;
-  case TEAM_DROIDS:
+  case TEAM_ALIENS:
     return blue;
   case TEAM_SPECTATOR:
     return spectator;
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index aa387211..a2f5a2b0 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -1054,9 +1054,9 @@ void CG_AddPacketEntities( void ) {
   CG_CalcEntityLerpPositions( &cg_entities[ cg.snap->ps.clientNum ] );
 
   //TA: "empty" item position arrays
-  cgIP.numDroidItems = 0;
+  cgIP.numAlienItems = 0;
   cgIP.numHumanItems = 0;
-  cgIP.numDroidClients = 0;
+  cgIP.numAlienClients = 0;
   cgIP.numHumanClients = 0;
 
   for ( num = 0 ; num < cg.snap->numEntities ; num++ )
@@ -1066,11 +1066,11 @@ void CG_AddPacketEntities( void ) {
     if( cent->currentState.eType == ET_BUILDABLE )
     {
       //TA: add to list of item positions (for creep)
-      if( cent->currentState.modelindex2 == BIT_DROIDS )
+      if( cent->currentState.modelindex2 == BIT_ALIENS )
       {
-        VectorCopy( cent->lerpOrigin, cgIP.droidItemPositions[ cgIP.numDroidItems ] );
-        cgIP.droidItemTimes[ cgIP.numDroidItems ] = cent->miscTime;
-        cgIP.numDroidItems++;
+        VectorCopy( cent->lerpOrigin, cgIP.alienItemPositions[ cgIP.numAlienItems ] );
+        cgIP.alienItemTimes[ cgIP.numAlienItems ] = cent->miscTime;
+        cgIP.numAlienItems++;
       }
       else if( cent->currentState.modelindex2 == BIT_HUMANS )
       {
@@ -1084,11 +1084,11 @@ void CG_AddPacketEntities( void ) {
       int team = cent->currentState.powerups & 0x00FF;
       int class = ( cent->currentState.powerups & 0xFF00 ) >> 8;
 
-      if( team == PTE_DROIDS )
+      if( team == PTE_ALIENS )
       {
-        VectorCopy( cent->lerpOrigin, cgIP.droidClientPositions[ cgIP.numDroidClients ] );
-        cgIP.droidClientClass = class;
-        cgIP.numDroidClients++;
+        VectorCopy( cent->lerpOrigin, cgIP.alienClientPositions[ cgIP.numAlienClients ] );
+        cgIP.alienClientClass = class;
+        cgIP.numAlienClients++;
       }
       else if( team == PTE_HUMANS )
       {
@@ -1099,7 +1099,7 @@ void CG_AddPacketEntities( void ) {
     }
   }
 
-  //Com_Printf( "%d %d\n", cgIP.numDroidClients, cgIP.numHumanClients );
+  //Com_Printf( "%d %d\n", cgIP.numAlienClients, cgIP.numHumanClients );
 
   // add each entity sent over by the server
   for ( num = 0 ; num < cg.snap->numEntities ; num++ ) {
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 24a9e988..b8f87a84 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -830,7 +830,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
     trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.respawnSound );
     break;
 
-  //TA: make droid items "grow"
+  //TA: make alien items "grow"
   case EV_BUILD_CONSTRUCT:
     DEBUGNAME("EV_BUILD_CONSTRUCT");
     cent->miscTime = cg.time; // scale up from this
@@ -839,7 +839,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
     cent->buildableAnim = es->eventParm;
     break;
     
-  //TA: make droid creep "recede"
+  //TA: make alien creep "recede"
   case EV_BUILD_DESTROY:
     DEBUGNAME("EV_BUILD_DESTROY");
     cent->miscTime = -cg.time; // scale down from this
@@ -1033,8 +1033,8 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
     CG_GibPlayer( cent->lerpOrigin );
     break;
 
-  case EV_GIB_DROID:
-    DEBUGNAME("EV_GIB_DROID");
+  case EV_GIB_ALIEN:
+    DEBUGNAME("EV_GIB_ALIEN");
     trap_S_StartSound( NULL, es->number, CHAN_BODY, cgs.media.gibSound );
     CG_GenericGib( cent->lerpOrigin );
     break;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 44b4f9d4..8ed1a054 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -226,7 +226,7 @@ typedef enum {
   LEMT_NONE,
   LEMT_BURN,
   LEMT_BLOOD,
-  LEMT_GREENBLOOD, //TA: when droids are injured
+  LEMT_GREENBLOOD, //TA: when aliens are injured
   LEMT_BANG        //TA: human item explosions
 } leMarkType_t;     // fragment local entities can leave marks on walls
 
@@ -791,16 +791,16 @@ typedef struct {
   qhandle_t humanTorch3;
   qhandle_t humanTorch2;
   qhandle_t humanTorch1;
-  qhandle_t droidNav9;
-  qhandle_t droidNav8;
-  qhandle_t droidNav7;
-  qhandle_t droidNav6;
-  qhandle_t droidNav5;
-  qhandle_t droidNav4;
-  qhandle_t droidNav3;
-  qhandle_t droidNav2;
-  qhandle_t droidNav1;
-  qhandle_t droidHealth;
+  qhandle_t alienNav9;
+  qhandle_t alienNav8;
+  qhandle_t alienNav7;
+  qhandle_t alienNav6;
+  qhandle_t alienNav5;
+  qhandle_t alienNav4;
+  qhandle_t alienNav3;
+  qhandle_t alienNav2;
+  qhandle_t alienNav1;
+  qhandle_t alienHealth;
 
   qhandle_t flameShader[ 32 ];
   qhandle_t flameExplShader;
@@ -1107,16 +1107,16 @@ extern  markPoly_t    cg_markPolys[MAX_MARK_POLYS];
 //TA:
 typedef struct
 {
-  vec3_t    droidItemPositions[ MAX_ITEMS ];
-  int       droidItemTimes[ MAX_ITEMS ];
-  int       numDroidItems;
+  vec3_t    alienItemPositions[ MAX_ITEMS ];
+  int       alienItemTimes[ MAX_ITEMS ];
+  int       numAlienItems;
   
   vec3_t    humanItemPositions[ MAX_ITEMS ];
   int       numHumanItems;
   
-  vec3_t    droidClientPositions[ MAX_CLIENTS ];
-  int       droidClientClass;
-  int       numDroidClients;
+  vec3_t    alienClientPositions[ MAX_CLIENTS ];
+  int       alienClientClass;
+  int       numAlienClients;
   
   vec3_t    humanClientPositions[ MAX_CLIENTS ];
   int       humanClientClass;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 3a384845..7cc25a3f 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -752,7 +752,7 @@ static void CG_RegisterGraphics( void ) {
     
   /*cgs.media.creepShader = trap_R_RegisterShader( "creep" );*/
   
-  cgs.media.scannerBlipShader = trap_R_RegisterShader( "gfx/2d/droidhealth" );
+  cgs.media.scannerBlipShader = trap_R_RegisterShader( "gfx/2d/alienhealth" );
   cgs.media.scannerLineShader = trap_R_RegisterShader( "gfx/2d/func/mult2" );
   /*cgs.media.scannerShader = trap_R_RegisterShader( "gfx/2d/scanner" );*/
   
@@ -815,16 +815,16 @@ static void CG_RegisterGraphics( void ) {
   cgs.media.humanTorch3 = trap_R_RegisterShader( "humanTorch3" );
   cgs.media.humanTorch2 = trap_R_RegisterShader( "humanTorch2" );
   cgs.media.humanTorch1 = trap_R_RegisterShader( "humanTorch1" );
-  cgs.media.droidNav9 = trap_R_RegisterShader( "droidNav9" );
-  cgs.media.droidNav8 = trap_R_RegisterShader( "droidNav8" );
-  cgs.media.droidNav7 = trap_R_RegisterShader( "droidNav7" );
-  cgs.media.droidNav6 = trap_R_RegisterShader( "droidNav6" );
-  cgs.media.droidNav5 = trap_R_RegisterShader( "droidNav5" );
-  cgs.media.droidNav4 = trap_R_RegisterShader( "droidNav4" );
-  cgs.media.droidNav3 = trap_R_RegisterShader( "droidNav3" );
-  cgs.media.droidNav2 = trap_R_RegisterShader( "droidNav2" );
-  cgs.media.droidNav1 = trap_R_RegisterShader( "droidNav1" );
-  cgs.media.droidHealth = trap_R_RegisterShader( "gfx/2d/droidhealth.tga" );
+  cgs.media.alienNav9 = trap_R_RegisterShader( "alienNav9" );
+  cgs.media.alienNav8 = trap_R_RegisterShader( "alienNav8" );
+  cgs.media.alienNav7 = trap_R_RegisterShader( "alienNav7" );
+  cgs.media.alienNav6 = trap_R_RegisterShader( "alienNav6" );
+  cgs.media.alienNav5 = trap_R_RegisterShader( "alienNav5" );
+  cgs.media.alienNav4 = trap_R_RegisterShader( "alienNav4" );
+  cgs.media.alienNav3 = trap_R_RegisterShader( "alienNav3" );
+  cgs.media.alienNav2 = trap_R_RegisterShader( "alienNav2" );
+  cgs.media.alienNav1 = trap_R_RegisterShader( "alienNav1" );
+  cgs.media.alienHealth = trap_R_RegisterShader( "gfx/2d/alienhealth.tga" );
 
   cgs.media.armorModel = trap_R_RegisterModel( "models/powerups/armor/armor_yel.md3" );
   cgs.media.armorIcon  = trap_R_RegisterShaderNoMip( "icons/iconr_yellow" );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index 016eebd7..9a95556c 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -1951,7 +1951,7 @@ void CG_Player( centity_t *cent )
   //
   CG_AddPlayerWeapon( &torso, NULL, cent );
 
-  if( ( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_DROIDS ) &&
+  if( ( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS ) &&
       ( ( cent->currentState.powerups & 0xFF ) == PTE_HUMANS ) )
     trap_R_AddAdditiveLightToScene( cent->lerpOrigin, 64, 0.1, 0.1, 0.4 );
 }
diff --git a/src/cgame/cg_scanner.c b/src/cgame/cg_scanner.c
index e02939bd..c4a7a067 100644
--- a/src/cgame/cg_scanner.c
+++ b/src/cgame/cg_scanner.c
@@ -77,10 +77,10 @@ void CG_Scanner( )
   }
   
   //draw alien items below scanner plane
-  for( i = 0; i < cgIP.numDroidItems; i++ )
+  for( i = 0; i < cgIP.numAlienItems; i++ )
   {
     VectorClear( relOrigin );
-    VectorSubtract( cgIP.droidItemPositions[ i ], origin, relOrigin );
+    VectorSubtract( cgIP.alienItemPositions[ i ], origin, relOrigin );
 
     if( VectorLength( relOrigin ) < RANGE && ( relOrigin[ 2 ] < 0 ) )
       CG_DrawBlips( relOrigin, aIbelow );
@@ -99,10 +99,10 @@ void CG_Scanner( )
   }
 
   //draw alien items above scanner plane
-  for( i = 0; i < cgIP.numDroidItems; i++ )
+  for( i = 0; i < cgIP.numAlienItems; i++ )
   {
     VectorClear( relOrigin );
-    VectorSubtract( cgIP.droidItemPositions[ i ], origin, relOrigin );
+    VectorSubtract( cgIP.alienItemPositions[ i ], origin, relOrigin );
 
     if( VectorLength( relOrigin ) < RANGE && ( relOrigin[ 2 ] > 0 ) )
       CG_DrawBlips( relOrigin, aIabove );
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index a8c04291..46d8d822 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -1167,7 +1167,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
     }
   }
 
-  if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_DROIDS &&
+  if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS &&
       cg.predictedPlayerState.persistant[PERS_TEAM] != TEAM_SPECTATOR )
     trap_R_AddAdditiveLightToScene( cg.predictedPlayerState.origin, 500, 0.07f, 0.07f, 0.07f );