6 files changed, 50 insertions, 5 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index cc087856..ff9d2525 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1094,7 +1094,8 @@ static float CG_DrawScores( float y ) {
 
     x = 640;
     score = cg.snap->ps.persistant[PERS_SCORE];
-    spectator = ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR );
+    spectator = ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
+                ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING );
 
     // always show your score in the second box if not in first place
     if ( s1 != score ) {
@@ -1805,7 +1806,8 @@ static void CG_DrawCrosshair(void) {
     return;
   }
 
-  if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR) {
+  if( ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ) {
     return;
   }
 
@@ -2224,7 +2226,8 @@ static void CG_Draw2D( void ) {
     return;
   }
 
-  if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) {
+  if( ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ) {
     CG_DrawSpectator();
     CG_DrawCrosshair();
     CG_DrawCrosshairNames();
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index c8a3fab2..a2be137c 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -421,6 +421,9 @@ CG_Menu
 */
 void CG_Menu( int eventParm )
 {
+  char  menuDef[ MAX_STRING_CHARS ];
+  int   i;
+  
   switch( eventParm )
   {
     case MN_TEAM:
@@ -447,6 +450,20 @@ void CG_Menu( int eventParm )
       trap_SendConsoleCommand( "menu hmcumenu\n" );
       break;
 
+    case MN_INFEST:
+      strcpy( menuDef, "5,5|Infest|0.8,0,0.8,1|0.6,0,0.6,0.8|1,0,1,1|1|16|" );
+      for( i = PCL_NONE + 1; i < PCL_NUM_CLASSES; i++ )
+      {
+        if( BG_ClassCanEvolveFromTo( cg.snap->ps.stats[ STAT_PCLASS ], i ) )
+          strcat( menuDef, va( "%s, class %s|", BG_FindNameForClassNum( i ), BG_FindNameForClassNum( i ) ) );
+      }
+      strcat( menuDef, "|Choose a class|to evolve to" );
+      
+      trap_SendConsoleCommand( va( "defmenu infest \"%s\"\n", menuDef ) );
+      trap_SendConsoleCommand( "menu infest\n" );
+      trap_SendConsoleCommand( "undefmenu infest\n" );
+      break;
+
     default:
       Com_Printf( "cgame: debug: no such menu %d\n", eventParm );
 
@@ -985,6 +1002,12 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
       CG_Menu( es->eventParm );
     break;
 
+  case EV_PLAYER_RESPAWN:
+    DEBUGNAME("EV_PLAYER_RESPAWN");
+    if( es->number == cg.clientNum )
+      cg.spawnTime = cg.time;
+    break;
+
   default:
     DEBUGNAME("UNKNOWN");
     CG_Error( "Unknown event: %i", event );
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index d1703528..886fb16a 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -632,6 +632,8 @@ typedef struct {
   char      testModelName[MAX_QPATH];
   qboolean    testGun;
 
+  int     spawnTime; //TA: fovwarp
+
 } cg_t;
 
 
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index dfcaf752..6ded046c 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -432,6 +432,8 @@ void CG_PredictPlayerState( void ) {
   cg_pmove.ps = &cg.predictedPlayerState;
   cg_pmove.trace = CG_Trace;
   cg_pmove.pointcontents = CG_PointContents;
+
+  //TA: FIXME BIG NEON SIGN..... COULD MAYBE BE A FIX FOR THAT HACK IN bg_pmove.c.. MAYBE \/
   if ( cg_pmove.ps->pm_type == PM_DEAD ) {
     cg_pmove.tracemask = MASK_PLAYERSOLID & ~CONTENTS_BODY;
   }
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index d8401334..393ac480 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -516,6 +516,7 @@ Fixed fov at intermissions, otherwise account for fov variable and zooms.
 */
 #define WAVE_AMPLITUDE  1
 #define WAVE_FREQUENCY  0.4
+#define FOVWARPTIME     400.0
 
 static int CG_CalcFov( void ) {
   float x;
@@ -545,6 +546,19 @@ static int CG_CalcFov( void ) {
       fov_x = 1;
     else if ( fov_x > 160 )
       fov_x = 160;
+
+    if( cg.spawnTime > ( cg.time - FOVWARPTIME ) &&
+        BG_ClassHasAbility( cg.predictedPlayerState.stats[ STAT_PCLASS ], SCA_FOVWARPS ) )
+    {
+      float temp, temp2;
+
+      temp = (float)( cg.time - cg.spawnTime ) / FOVWARPTIME;
+      temp2 = ( 180 - fov_x ) * temp;
+
+      //Com_Printf( "%f %f\n", temp*100, temp2*100 );
+
+      fov_x = 180 - temp2;
+    }
   }
 
   // account for zooms
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index 15992501..318e227a 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -1070,7 +1070,8 @@ void CG_AddViewWeapon( playerState_t *ps ) {
   vec3_t    angles;
   weaponInfo_t  *weapon;
 
-  if ( ps->persistant[PERS_TEAM] == TEAM_SPECTATOR ) {
+  if( ( ps->persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
+      ( ps->stats[ STAT_STATE ] & SS_INFESTING ) ) {
     return;
   }
 
@@ -1105,7 +1106,7 @@ void CG_AddViewWeapon( playerState_t *ps ) {
   //if ( cg_fov.integer > 90 ) {
   //TA: the client side variable isn't used ( shouldn't iD have done this anyway? )
   if( cg.refdef.fov_y > 90 )
-    fovOffset = -0.2 * ( cg.refdef.fov_y - 90 );
+    fovOffset = -0.4 * ( cg.refdef.fov_y - 90 );
   else
     fovOffset = 0;