Merge branch 'v11b'

26 files changed, 261 insertions, 381 deletions

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 5b2582c..e2e33f8 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -709,7 +709,7 @@ static void CG_BuildableParticleEffects( centity_t *cent )
 {
   entityState_t   *es = &cent->currentState;
   team_t          team = BG_Buildable( es->modelindex )->team;
-  int             health = es->generic1;
+  int             health = es->constantLight;
   float           healthFrac = (float)health / BG_Buildable( es->modelindex )->health;
 
   if( !( es->eFlags & EF_B_SPAWNED ) )
@@ -1055,7 +1055,7 @@ static void CG_BuildableStatusDisplay( centity_t *cent )
       return;
   }
 
-  health = es->generic1;
+  health = es->constantLight;
   healthScale = (float)health / BG_Buildable( es->modelindex )->health;
 
   if( health > 0 && healthScale < 0.01f )
@@ -1535,7 +1535,7 @@ void CG_Buildable( centity_t *cent )
       trap_S_AddLoopingSound( es->number, cent->lerpOrigin, vec3_origin, weapon->readySound );
   }
 
-  health = es->generic1;
+  health = es->constantLight;
 
   if( health < cent->lastBuildableHealth &&
       ( es->eFlags & EF_B_SPAWNED ) )
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 4e2ba77..1d18023 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -4072,7 +4072,7 @@ static void CG_DrawHealthBars( void )
         if( CG_PlayerIsBuilder( es->modelindex ) )
           continue;
 
-        bar->value = es->generic1;
+        bar->value = es->constantLight;
         bar->max = BG_Buildable( es->modelindex )->health;
         BG_BuildableBoundingBox( es->modelindex, mins, maxs );
         break;
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index a9663ad..13e0470 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -236,7 +236,8 @@ static void CG_EntityEffects( centity_t *cent )
 
 
   // constant light glow
-  if ( cent->currentState.constantLight )
+  if ( cent->currentState.eType == ET_MOVER &&
+       cent->currentState.constantLight )
   {
     int   cl;
     int   i, r, g, b;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 7721e45..b405cc6 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1072,8 +1072,6 @@ typedef struct
   int           itemPickupBlendTime;                // the pulse around the crosshair is timed seperately
 
   int           weaponSelectTime;
-  int           weaponAnimation;
-  int           weaponAnimationTime;
 
   // blend blobs
   float         damageTime;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 2761922..11ea540 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -85,9 +85,6 @@ Q_EXPORT intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3,
       CG_EventHandling( arg0 );
       return 0;
 
-    case CG_VOIP_STRING:
-      return (intptr_t)CG_VoIPString( );
-
     default:
       CG_Error( "vmMain: unknown command %i", command );
       break;
@@ -2055,3 +2052,18 @@ static char *CG_VoIPString( void )
   return voipString;
 }
 
+// missing syscalls
+
+void trap_R_SetClipRegion( const float *region )
+{
+}
+
+void trap_Key_SetOverstrikeMode( qboolean state )
+{
+}
+
+qboolean trap_Key_GetOverstrikeMode( void )
+{
+  return qfalse;
+}
+
diff --git a/src/cgame/cg_public.h b/src/cgame/cg_public.h
index 9d197ff..75b4b48 100644
--- a/src/cgame/cg_public.h
+++ b/src/cgame/cg_public.h
@@ -120,7 +120,6 @@ typedef enum
   CG_R_ADDLIGHTTOSCENE,
   CG_R_RENDERSCENE,
   CG_R_SETCOLOR,
-  CG_R_SETCLIPREGION,
   CG_R_DRAWSTRETCHPIC,
   CG_R_MODELBOUNDS,
   CG_R_LERPTAG,
@@ -139,6 +138,11 @@ typedef enum
   CG_KEY_GETCATCHER,
   CG_KEY_SETCATCHER,
   CG_KEY_GETKEY,
+  CG_PARSE_ADD_GLOBAL_DEFINE,
+  CG_PARSE_LOAD_SOURCE,
+  CG_PARSE_FREE_SOURCE,
+  CG_PARSE_READ_TOKEN,
+  CG_PARSE_SOURCE_FILE_AND_LINE,
   CG_S_STOPBACKGROUNDTRACK,
   CG_REAL_TIME,
   CG_SNAPVECTOR,
@@ -173,17 +177,6 @@ typedef enum
   CG_KEY_GETBINDINGBUF,
   CG_KEY_SETBINDING,
 
-  CG_PARSE_ADD_GLOBAL_DEFINE,
-  CG_PARSE_LOAD_SOURCE,
-  CG_PARSE_FREE_SOURCE,
-  CG_PARSE_READ_TOKEN,
-  CG_PARSE_SOURCE_FILE_AND_LINE,
-
-  CG_KEY_SETOVERSTRIKEMODE,
-  CG_KEY_GETOVERSTRIKEMODE,
-
-  CG_S_SOUNDDURATION,
-
   CG_MEMSET = 200,
   CG_MEMCPY,
   CG_STRNCPY,
@@ -253,10 +246,6 @@ typedef enum
   // void (*CG_ConsoleText)( void );
   // pass text that has been printed to the console to cgame
   // use Cmd_Argc() / Cmd_Argv() to read it
-
-  CG_VOIP_STRING
-  // char *(*CG_VoIPString)( void );
-  // returns a string of comma-delimited clientnums based on cl_voipSendTarget
 } cgameExport_t;
 
 //----------------------------------------------
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index c2be336..e59cf8a 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -1012,12 +1012,12 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text )
   switch( mode )
   {
     case SAY_ALL:
-      CG_Printf( "%s%s" S_COLOR_WHITE "%s %c" S_COLOR_GREEN "%s\n",
-                 prefix, name, maybeColon, INDENT_MARKER, text );
+      CG_Printf( "%s%s" S_COLOR_WHITE "%s " S_COLOR_GREEN "%s\n",
+                 prefix, name, maybeColon, text );
       break;
     case SAY_TEAM:
-      CG_Printf( "%s(%s" S_COLOR_WHITE ")%s%s %c" S_COLOR_CYAN "%s\n",
-                 prefix, name, location, maybeColon, INDENT_MARKER, text );
+      CG_Printf( "%s(%s" S_COLOR_WHITE ")%s%s " S_COLOR_CYAN "%s\n",
+                 prefix, name, location, maybeColon, text );
       break;
     case SAY_ADMINS:
     case SAY_ADMINS_PUBLIC:
@@ -1027,15 +1027,15 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text )
                  name, maybeColon, INDENT_MARKER, text );
       break;
     case SAY_AREA:
-      CG_Printf( "%s<%s" S_COLOR_WHITE ">%s%s %c" S_COLOR_BLUE "%s\n",
-                 prefix, name, location, maybeColon, INDENT_MARKER, text );
+      CG_Printf( "%s<%s" S_COLOR_WHITE ">%s%s " S_COLOR_BLUE "%s\n",
+                 prefix, name, location, maybeColon, text );
       break;
     case SAY_PRIVMSG:
     case SAY_TPRIVMSG:
       color = ( mode == SAY_TPRIVMSG ) ? S_COLOR_CYAN : S_COLOR_GREEN;
-      CG_Printf( "%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %c%s%s\n",
+      CG_Printf( "%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %s%s\n",
                  prefix, name, cgs.clientinfo[ cg.clientNum ].name,
-                 maybeColon, INDENT_MARKER, color, text );
+                 maybeColon, color, text );
       CG_CenterPrint( va( "%sPrivate message from: " S_COLOR_WHITE "%s", 
                           color, name ), 200, GIANTCHAR_WIDTH * 4 );
       break;
diff --git a/src/cgame/cg_syscalls.asm b/src/cgame/cg_syscalls.asm
index 2537c91..0893ebc 100644
--- a/src/cgame/cg_syscalls.asm
+++ b/src/cgame/cg_syscalls.asm
@@ -46,66 +46,60 @@ equ trap_R_AddPolyToScene             -43
 equ trap_R_AddLightToScene            -44
 equ trap_R_RenderScene                -45
 equ trap_R_SetColor                   -46
-equ trap_R_SetClipRegion              -47
-equ trap_R_DrawStretchPic             -48
-equ trap_R_ModelBounds                -49
-equ trap_R_LerpTag                    -50
-equ trap_GetGlconfig                  -51
-equ trap_GetGameState                 -52
-equ trap_GetCurrentSnapshotNumber     -53
-equ trap_GetSnapshot                  -54
-equ trap_GetServerCommand             -55
-equ trap_GetCurrentCmdNumber          -56
-equ trap_GetUserCmd                   -57
-equ trap_SetUserCmdValue              -58
-equ trap_R_RegisterShaderNoMip        -59
-equ trap_MemoryRemaining              -60
-equ trap_R_RegisterFont               -61
-equ trap_Key_IsDown                   -62
-equ trap_Key_GetCatcher               -63
-equ trap_Key_SetCatcher               -64
-equ trap_Key_GetKey                   -65
-equ trap_S_StopBackgroundTrack        -66
-equ trap_RealTime                     -67
-equ trap_SnapVector                   -68
-equ trap_RemoveCommand                -69
-equ trap_R_LightForPoint              -70
-equ trap_CIN_PlayCinematic            -71
-equ trap_CIN_StopCinematic            -72
-equ trap_CIN_RunCinematic             -73
-equ trap_CIN_DrawCinematic            -74
-equ trap_CIN_SetExtents               -75
-equ trap_R_RemapShader                -76
-equ trap_S_AddRealLoopingSound        -77
-equ trap_S_StopLoopingSound           -78
-equ trap_CM_TempCapsuleModel          -79
-equ trap_CM_CapsuleTrace              -80
-equ trap_CM_TransformedCapsuleTrace   -81
-equ trap_R_AddAdditiveLightToScene    -82
-equ trap_GetEntityToken               -83
-equ trap_R_AddPolysToScene            -84
-equ trap_R_inPVS                      -85
-equ trap_FS_Seek                      -86
-equ trap_FS_GetFileList               -87
-equ trap_LiteralArgs                  -88
-equ trap_CM_BiSphereTrace             -89
-equ trap_CM_TransformedBiSphereTrace  -90
-equ trap_GetDemoState                 -91
-equ trap_GetDemoPos                   -92
-equ trap_GetDemoName                  -93
-equ trap_Key_KeynumToStringBuf        -94
-equ trap_Key_GetBindingBuf            -95
-equ trap_Key_SetBinding               -96
-
-equ trap_Parse_AddGlobalDefine        -97
-equ trap_Parse_LoadSource             -98
-equ trap_Parse_FreeSource             -99
-equ trap_Parse_ReadToken              -100
-equ trap_Parse_SourceFileAndLine      -101
-equ trap_Key_SetOverstrikeMode        -102
-equ trap_Key_GetOverstrikeMode        -103
-
-equ trap_S_SoundDuration              -104
+equ trap_R_DrawStretchPic             -47
+equ trap_R_ModelBounds                -48
+equ trap_R_LerpTag                    -49
+equ trap_GetGlconfig                  -50
+equ trap_GetGameState                 -51
+equ trap_GetCurrentSnapshotNumber     -52
+equ trap_GetSnapshot                  -53
+equ trap_GetServerCommand             -54
+equ trap_GetCurrentCmdNumber          -55
+equ trap_GetUserCmd                   -56
+equ trap_SetUserCmdValue              -57
+equ trap_R_RegisterShaderNoMip        -58
+equ trap_MemoryRemaining              -59
+equ trap_R_RegisterFont               -60
+equ trap_Key_IsDown                   -61
+equ trap_Key_GetCatcher               -62
+equ trap_Key_SetCatcher               -63
+equ trap_Key_GetKey                   -64
+equ trap_Parse_AddGlobalDefine        -65
+equ trap_Parse_LoadSource             -66
+equ trap_Parse_FreeSource             -67
+equ trap_Parse_ReadToken              -68
+equ trap_Parse_SourceFileAndLine      -69
+equ trap_S_StopBackgroundTrack        -70
+equ trap_RealTime                     -71
+equ trap_SnapVector                   -72
+equ trap_RemoveCommand                -73
+equ trap_R_LightForPoint              -74
+equ trap_CIN_PlayCinematic            -75
+equ trap_CIN_StopCinematic            -76
+equ trap_CIN_RunCinematic             -77
+equ trap_CIN_DrawCinematic            -78
+equ trap_CIN_SetExtents               -79
+equ trap_R_RemapShader                -80
+equ trap_S_AddRealLoopingSound        -81
+equ trap_S_StopLoopingSound           -82
+equ trap_CM_TempCapsuleModel          -83
+equ trap_CM_CapsuleTrace              -84
+equ trap_CM_TransformedCapsuleTrace   -85
+equ trap_R_AddAdditiveLightToScene    -86
+equ trap_GetEntityToken               -87
+equ trap_R_AddPolysToScene            -88
+equ trap_R_inPVS                      -89
+equ trap_FS_Seek                      -90
+equ trap_FS_GetFileList               -91
+equ trap_LiteralArgs                  -92
+equ trap_CM_BiSphereTrace             -93
+equ trap_CM_TransformedBiSphereTrace  -94
+equ trap_GetDemoState                 -95
+equ trap_GetDemoPos                   -96
+equ trap_GetDemoName                  -97
+equ trap_Key_KeynumToStringBuf        -98
+equ trap_Key_GetBindingBuf            -99
+equ trap_Key_SetBinding               -100
 
 equ memset                            -201
 equ memcpy                            -202
diff --git a/src/cgame/cg_syscalls.c b/src/cgame/cg_syscalls.c
index 0c0b722..321783a 100644
--- a/src/cgame/cg_syscalls.c
+++ b/src/cgame/cg_syscalls.c
@@ -290,11 +290,6 @@ sfxHandle_t trap_S_RegisterSound( const char *sample, qboolean compressed )
   return syscall( CG_S_REGISTERSOUND, sample, compressed );
 }
 
-int trap_S_SoundDuration( sfxHandle_t handle )
-{
-  return syscall( CG_S_SOUNDDURATION, handle );
-}
-
 void  trap_S_StartBackgroundTrack( const char *intro, const char *loop )
 {
   syscall( CG_S_STARTBACKGROUNDTRACK, intro, loop );
@@ -380,11 +375,6 @@ void  trap_R_SetColor( const float *rgba )
   syscall( CG_R_SETCOLOR, rgba );
 }
 
-void  trap_R_SetClipRegion( const float *region )
-{
-  syscall( CG_R_SETCLIPREGION, region );
-}
-
 void  trap_R_DrawStretchPic( float x, float y, float w, float h,
                  float s1, float t1, float s2, float t2, qhandle_t hShader )
 {
@@ -582,11 +572,3 @@ void trap_Key_GetBindingBuf( int keynum, char *buf, int buflen ) {
 void trap_Key_SetBinding( int keynum, const char *binding ) {
   syscall( CG_KEY_SETBINDING, keynum, binding );
 }
-
-void trap_Key_SetOverstrikeMode( qboolean state ) {
-  syscall( CG_KEY_SETOVERSTRIKEMODE, state );
-}
-
-qboolean trap_Key_GetOverstrikeMode( void ) {
-  return syscall( CG_KEY_GETOVERSTRIKEMODE );
-}
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index 7fb68c9..f57eb41 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -746,27 +746,6 @@ static void CG_SetWeaponLerpFrameAnimation( weapon_t weapon, lerpFrame_t *lf, in
 }
 
 /*
-===============
-CG_WeaponAnimation
-===============
-*/
-static void CG_WeaponAnimation( centity_t *cent, int *old, int *now, float *backLerp )
-{
-  lerpFrame_t   *lf = &cent->pe.weapon;
-  entityState_t *es = &cent->currentState;
-
-  // see if the animation sequence is switching
-  if( es->weaponAnim != lf->animationNumber || !lf->animation )
-    CG_SetWeaponLerpFrameAnimation( es->weapon, lf, es->weaponAnim );
-
-  CG_RunLerpFrame( lf, 1.0f );
-
-  *old      = lf->oldFrame;
-  *now      = lf->frame;
-  *backLerp = lf->backlerp;
-}
-
-/*
 =================
 CG_MapTorsoToWeaponFrame
 
@@ -1073,8 +1052,6 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent
         gun.customShader = cgs.media.invisibleShaderTeam;
     }
 
-    CG_WeaponAnimation( cent, &gun.oldframe, &gun.frame, &gun.backlerp );
-
     trap_R_AddRefEntityToScene( &gun );
 
     if( !ps )
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 8f6da8e..9a8cef1 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -4197,7 +4197,6 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
   s->time2 = ps->movementDir;
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
-  s->weaponAnim = ps->weaponAnim;
   s->clientNum = ps->clientNum;   // ET_PLAYER looks here instead of at number
                     // so corpses can also reference the proper config
   s->eFlags = ps->eFlags;
@@ -4297,7 +4296,6 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
   s->time2 = ps->movementDir;
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
-  s->weaponAnim = ps->weaponAnim;
   s->clientNum = ps->clientNum;   // ET_PLAYER looks here instead of at number
                     // so corpses can also reference the proper config
   s->eFlags = ps->eFlags;
@@ -5238,3 +5236,10 @@ qboolean BG_ForceFieldForEntity( playerState_t *ps, entityState_t *es, forceFiel
 
   return qfalse;
 }
+
+// missing syscalls
+
+int trap_S_SoundDuration( sfxHandle_t handle )
+{
+  return 1000;
+}
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index f8f8a69..7af9a89 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -110,20 +110,6 @@ void PM_StartTorsoAnim( int anim )
 
 /*
 ===================
-PM_StartWeaponAnim
-===================
-*/
-static void PM_StartWeaponAnim( int anim )
-{
-  if( PM_Paralyzed( pm->ps->pm_type ) )
-    return;
-
-  pm->ps->weaponAnim = ( ( pm->ps->weaponAnim & ANIM_TOGGLEBIT ) ^ ANIM_TOGGLEBIT )
-    | anim;
-}
-
-/*
-===================
 PM_StartLegsAnim
 ===================
 */
@@ -191,19 +177,6 @@ static void PM_ContinueTorsoAnim( int anim )
 
 /*
 ===================
-PM_ContinueWeaponAnim
-===================
-*/
-static void PM_ContinueWeaponAnim( int anim )
-{
-  if( ( pm->ps->weaponAnim & ~ANIM_TOGGLEBIT ) == anim )
-    return;
-
-  PM_StartWeaponAnim( anim );
-}
-
-/*
-===================
 PM_ForceLegsAnim
 ===================
 */
@@ -2886,7 +2859,6 @@ static void PM_BeginWeaponChange( int weapon )
   if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
   {
     PM_StartTorsoAnim( TORSO_DROP );
-    PM_StartWeaponAnim( WANIM_DROP );
   }
 }
 
@@ -2915,7 +2887,6 @@ static void PM_FinishWeaponChange( void )
   if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
   {
     PM_StartTorsoAnim( TORSO_RAISE );
-    PM_StartWeaponAnim( WANIM_RAISE );
   }
 }
 
@@ -2945,8 +2916,6 @@ static void PM_TorsoAnimation( void )
         PM_ContinueTorsoAnim( TORSO_STAND );
       }
     }
-
-    PM_ContinueWeaponAnim( WANIM_IDLE );
   }
 }
 
@@ -3225,8 +3194,6 @@ static void PM_Weapon( void )
         PM_ContinueTorsoAnim( TORSO_STAND );
     }
 
-    PM_ContinueWeaponAnim( WANIM_IDLE );
-
     return;
   }
 
@@ -3278,7 +3245,6 @@ static void PM_Weapon( void )
 
     //drop the weapon
     PM_StartTorsoAnim( TORSO_DROP );
-    PM_StartWeaponAnim( WANIM_RELOAD );
 
     pm->ps->weaponTime += BG_Weapon( pm->ps->weapon )->reloadTime;
     return;
@@ -3531,17 +3497,14 @@ static void PM_Weapon( void )
     {
       case WP_GRENADE:
         PM_StartTorsoAnim( TORSO_ATTACK3 );
-        PM_StartWeaponAnim( WANIM_ATTACK1 );
         break;
 
       case WP_BLASTER:
         PM_StartTorsoAnim( TORSO_ATTACK2 );
-        PM_StartWeaponAnim( WANIM_ATTACK1 );
         break;
 
       default:
         PM_StartTorsoAnim( TORSO_ATTACK );
-        PM_StartWeaponAnim( WANIM_ATTACK1 );
         break;
     }
   }
@@ -3556,9 +3519,7 @@ static void PM_Weapon( void )
       case WP_ALEVEL1:
         if( attack1 )
         {
-          num /= RAND_MAX / 6 + 1;
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         }
         break;
 
@@ -3566,38 +3527,31 @@ static void PM_Weapon( void )
         if( attack2 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK2 );
-          PM_StartWeaponAnim( WANIM_ATTACK7 );
         }
       case WP_ALEVEL2:
         if( attack1 )
         {
-          num /= RAND_MAX / 6 + 1;
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         }
         break;
 
       case WP_ALEVEL4:
         num /= RAND_MAX / 3 + 1;
         PM_ForceLegsAnim( NSPA_ATTACK1 + num );
-        PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         break;
 
       default:
         if( attack1 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 );
         }
         else if( attack2 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK2 );
-          PM_StartWeaponAnim( WANIM_ATTACK2 );
         }
         else if( attack3 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK3 );
-          PM_StartWeaponAnim( WANIM_ATTACK3 );
         }
         break;
     }
@@ -3686,8 +3640,6 @@ static void PM_Animate( void )
 
   if( pm->cmd.buttons & BUTTON_GESTURE )
   {
-    if( pm->ps->tauntTimer > 0 )
-        return;
 
     if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
     {
@@ -3695,7 +3647,6 @@ static void PM_Animate( void )
       {
         PM_StartTorsoAnim( TORSO_GESTURE );
         pm->ps->torsoTimer = TIMER_GESTURE;
-        pm->ps->tauntTimer = TIMER_GESTURE;
 
         PM_AddEvent( EV_TAUNT );
       }
@@ -3706,7 +3657,6 @@ static void PM_Animate( void )
       {
         PM_ForceLegsAnim( NSPA_GESTURE );
         pm->ps->torsoTimer = TIMER_GESTURE;
-        pm->ps->tauntTimer = TIMER_GESTURE;
 
         PM_AddEvent( EV_TAUNT );
       }
@@ -3750,16 +3700,6 @@ static void PM_DropTimers( void )
     if( pm->ps->torsoTimer < 0 )
       pm->ps->torsoTimer = 0;
   }
-
-  if( pm->ps->tauntTimer > 0 )
-  {
-    pm->ps->tauntTimer -= pml.msec;
-
-    if( pm->ps->tauntTimer < 0 )
-    {
-      pm->ps->tauntTimer = 0;
-    }
-  }
 }
 
 
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index f377739..9a2d464 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -32,7 +32,7 @@ TREMULOUS EDGE MOD SRC FILE
 
 // because games can change separately from the main system version, we need a
 // second version that must match between game and cgame
-#define GAME_VERSION            "base"
+#define GAME_VERSION            "newedge"
 #define DEFAULT_GRAVITY         800
 
 #define VOTE_TIME               30000 // 30 seconds before vote times out
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 8de275e..1c161a6 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -3277,7 +3277,7 @@ void G_BuildableThink( gentity_t *ent, int msec )
   ent->dcc = ( ent->buildableTeam != TEAM_HUMANS ) ? 0 : G_FindDCC( ent );
 
   // Set health
-  ent->s.generic1 = MAX( ent->health, 0 );
+  ent->s.constantLight = MAX( ent->health, 0 );
 
   // Set flags
   ent->s.eFlags &= ~( EF_B_POWERED | EF_B_SPAWNED | EF_B_MARKED );
@@ -4459,7 +4459,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable,
   built->physicsBounce = BG_Buildable( buildable )->bounce;
   built->s.groundEntityNum = -1;
 
-  built->s.generic1 = MAX( built->health, 0 );
+  built->s.constantLight = MAX( built->health, 0 );
 
   if( BG_Buildable( buildable )->team == TEAM_ALIENS )
   {
diff --git a/src/game/g_main.c b/src/game/g_main.c
index a07347e..65cdf87 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -2965,3 +2965,16 @@ void G_RunFrame( int levelTime )
   level.frameMsec = trap_Milliseconds();
 }
 
+// missing syscalls
+
+void trap_SetConfigstringRestrictions( int num, const clientList_t *clientList )
+{
+}
+
+void trap_AddCommand( const char *cmdName )
+{
+}
+
+void trap_RemoveCommand( const char *cmdName )
+{
+}
diff --git a/src/game/g_public.h b/src/game/g_public.h
index 9512574..effbe37 100644
--- a/src/game/g_public.h
+++ b/src/game/g_public.h
@@ -159,8 +159,6 @@ typedef enum {
 
   G_GET_CONFIGSTRING, // ( int num, char *buffer, int bufferSize );
 
-  G_SET_CONFIGSTRING_RESTRICTIONS, // ( int num, const clientList* clientList );
-
   G_GET_USERINFO,   // ( int num, char *buffer, int bufferSize );
   // userinfo strings are maintained by the server system, so they
   // are persistant across level loads, while all other game visible
@@ -226,10 +224,7 @@ typedef enum {
   G_PARSE_READ_TOKEN,
   G_PARSE_SOURCE_FILE_AND_LINE,
 
-  G_SEND_GAMESTAT,
-
-  G_ADDCOMMAND,
-  G_REMOVECOMMAND
+  G_SEND_GAMESTAT
 } gameImport_t;
 
 
diff --git a/src/game/g_syscalls.asm b/src/game/g_syscalls.asm
index f39b138..132ca1e 100644
--- a/src/game/g_syscalls.asm
+++ b/src/game/g_syscalls.asm
@@ -1,68 +1,65 @@
 code
 
-equ trap_Print                        -1
-equ trap_Error                        -2
-equ trap_Milliseconds                 -3
-equ trap_Cvar_Register                -4
-equ trap_Cvar_Update                  -5
-equ trap_Cvar_Set                     -6
-equ trap_Cvar_VariableIntegerValue    -7
-equ trap_Cvar_VariableStringBuffer    -8
-equ trap_Argc                         -9
-equ trap_Argv                         -10
-equ trap_FS_FOpenFile                 -11
-equ trap_FS_Read                      -12
-equ trap_FS_Write                     -13
-equ trap_FS_FCloseFile                -14
-equ trap_SendConsoleCommand           -15
-equ trap_LocateGameData               -16
-equ trap_DropClient                   -17
-equ trap_SendServerCommand            -18
-equ trap_SetConfigstring              -19
-equ trap_GetConfigstring              -20
-equ trap_SetConfigstringRestrictions  -21
-equ trap_GetUserinfo                  -22
-equ trap_SetUserinfo                  -23
-equ trap_GetServerinfo                -24
-equ trap_SetBrushModel                -25
-equ trap_Trace                        -26
-equ trap_PointContents                -27
-equ trap_InPVS                        -28
-equ trap_InPVSIgnorePortals           -29
-equ trap_AdjustAreaPortalState        -30
-equ trap_AreasConnected               -31
-equ trap_LinkEntity                   -32
-equ trap_UnlinkEntity                 -33
-equ trap_EntitiesInBox                -34
-equ trap_EntityContact                -35
-equ trap_GetUsercmd                   -36
-equ trap_GetEntityToken               -37
-equ trap_FS_GetFileList               -38
-equ trap_RealTime                     -39
-equ trap_SnapVector                   -40
-equ trap_TraceCapsule                 -41
-equ trap_EntityContactCapsule         -42
-equ trap_FS_Seek                      -43
+equ trap_Print                      -1
+equ trap_Error                      -2
+equ trap_Milliseconds               -3
+equ trap_Cvar_Register              -4
+equ trap_Cvar_Update                -5
+equ trap_Cvar_Set                   -6
+equ trap_Cvar_VariableIntegerValue  -7
+equ trap_Cvar_VariableStringBuffer  -8
+equ trap_Argc                       -9
+equ trap_Argv                       -10
+equ trap_FS_FOpenFile               -11
+equ trap_FS_Read                    -12
+equ trap_FS_Write                   -13
+equ trap_FS_FCloseFile              -14
+equ trap_SendConsoleCommand         -15
+equ trap_LocateGameData             -16
+equ trap_DropClient                 -17
+equ trap_SendServerCommand          -18
+equ trap_SetConfigstring            -19
+equ trap_GetConfigstring            -20
+equ trap_GetUserinfo                -21
+equ trap_SetUserinfo                -22
+equ trap_GetServerinfo              -23
+equ trap_SetBrushModel              -24
+equ trap_Trace                      -25
+equ trap_PointContents              -26
+equ trap_InPVS                      -27
+equ trap_InPVSIgnorePortals         -28
+equ trap_AdjustAreaPortalState      -29
+equ trap_AreasConnected             -30
+equ trap_LinkEntity                 -31
+equ trap_UnlinkEntity               -32
+equ trap_EntitiesInBox              -33
+equ trap_EntityContact              -34
+equ trap_GetUsercmd                 -35
+equ trap_GetEntityToken             -36
+equ trap_FS_GetFileList             -37
+equ trap_RealTime                   -38
+equ trap_SnapVector                 -39
+equ trap_TraceCapsule               -40
+equ trap_EntityContactCapsule       -41
+equ trap_FS_Seek                    -42
 
-equ trap_Parse_AddGlobalDefine        -44
-equ trap_Parse_LoadSource             -45
-equ trap_Parse_FreeSource             -46
-equ trap_Parse_ReadToken              -47
-equ trap_Parse_SourceFileAndLine      -48
+equ trap_Parse_AddGlobalDefine      -43
+equ trap_Parse_LoadSource           -44
+equ trap_Parse_FreeSource           -45
+equ trap_Parse_ReadToken            -46
+equ trap_Parse_SourceFileAndLine    -47
 
-equ trap_SendGameStat                 -49
+equ trap_SendGameStat               -48
 
-equ trap_AddCommand                   -50
-equ trap_RemoveCommand                -51
 
-equ memset                            -101
-equ memcpy                            -102
-equ strncpy                           -103
-equ sin                               -104
-equ cos                               -105
-equ atan2                             -106
-equ sqrt                              -107
-equ floor                             -111
-equ ceil                              -112
-equ testPrintInt                      -113
-equ testPrintFloat                    -114
+equ memset                          -101
+equ memcpy                          -102
+equ strncpy                         -103
+equ sin                             -104
+equ cos                             -105
+equ atan2                           -106
+equ sqrt                            -107
+equ floor                           -111
+equ ceil                            -112
+equ testPrintInt                    -113
+equ testPrintFloat                  -114
diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c
index 800bd2a..4ec48d3 100644
--- a/src/game/g_syscalls.c
+++ b/src/game/g_syscalls.c
@@ -151,11 +151,6 @@ void trap_GetConfigstring( int num, char *buffer, int bufferSize )
   syscall( G_GET_CONFIGSTRING, num, buffer, bufferSize );
 }
 
-void trap_SetConfigstringRestrictions( int num, const clientList_t *clientList )
-{
-  syscall( G_SET_CONFIGSTRING_RESTRICTIONS, num, clientList );
-}
-
 void trap_GetUserinfo( int num, char *buffer, int bufferSize )
 {
   syscall( G_GET_USERINFO, num, buffer, bufferSize );
@@ -290,14 +285,3 @@ int trap_Parse_SourceFileAndLine( int handle, char *filename, int *line )
 {
   return syscall( G_PARSE_SOURCE_FILE_AND_LINE, handle, filename, line );
 }
-
-void trap_AddCommand( const char *cmdName )
-{
-  syscall( G_ADDCOMMAND, cmdName );
-}
-
-void trap_RemoveCommand( const char *cmdName )
-{
-  syscall( G_REMOVECOMMAND, cmdName );
-}
-
diff --git a/src/game/g_team.c b/src/game/g_team.c
index ad0873c..3246a4a 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.c
@@ -147,6 +147,7 @@ void G_UpdateTeamConfigStrings( void )
     Com_Memset( &humanTeam, 0, sizeof( clientList_t ) );
   }
 
+/*
   trap_SetConfigstringRestrictions( CS_VOTE_TIME + TEAM_ALIENS,   &humanTeam );
   trap_SetConfigstringRestrictions( CS_VOTE_STRING + TEAM_ALIENS, &humanTeam );
   trap_SetConfigstringRestrictions( CS_VOTE_YES + TEAM_ALIENS,    &humanTeam );
@@ -159,6 +160,7 @@ void G_UpdateTeamConfigStrings( void )
 
   trap_SetConfigstringRestrictions( CS_ALIEN_STAGES, &humanTeam );
   trap_SetConfigstringRestrictions( CS_HUMAN_STAGES, &alienTeam );
+*/
 }
 
 /*
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index a93b630..1b5fea7 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1132,10 +1132,6 @@ typedef struct playerState_s {
 	int			torsoTimer;		// don't change low priority animations until this runs out
 	int			torsoAnim;		// mask off ANIM_TOGGLEBIT
 
-	int			tauntTimer;		// don't allow another taunt until this runs out
-
-	int			weaponAnim;		// mask off ANIM_TOGGLEBIT
-
 	int			movementDir;	// a number 0 to 7 that represents the reletive angle
 								// of movement to the view angle (axial and diagonals)
 								// when at rest, the value will remain unchanged
@@ -1169,8 +1165,9 @@ typedef struct playerState_s {
 	int			stats[MAX_STATS];
 	int			persistant[MAX_PERSISTANT];	// stats that aren't cleared on death
 	int			misc[MAX_MISC];	// misc data
-	int			ammo;			// ammo held
-	int			clips;			// clips held
+	int			ammo;
+	int			clips;
+	int			stuff[MAX_WEAPONS - 2];
 
 	int			generic1;
 	int			loopSound;
@@ -1289,7 +1286,6 @@ typedef struct entityState_s {
 	int		weapon;			// determines weapon and flash model, etc
 	int		legsAnim;		// mask off ANIM_TOGGLEBIT
 	int		torsoAnim;		// mask off ANIM_TOGGLEBIT
-	int		weaponAnim;		// mask off ANIM_TOGGLEBIT
 
 	int		generic1;
 } entityState_t;
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index db5812f..e24ecaf 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -240,7 +240,7 @@ PROTOCOL
 ==============================================================
 */
 
-#define	PROTOCOL_VERSION	70
+#define	PROTOCOL_VERSION	69
 
 // maintain a list of compatible protocols for demo playing
 // NOTE: that stuff only works with two digits protocols
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index dc5bc26..0278cca 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -4211,6 +4211,7 @@ void UI_SetActiveMenu( uiMenuCommand_t menu )
   // this should be the ONLY way the menu system is brought up
   // enusure minumum menu data is cached
 
+
   if( Menu_Count() > 0 )
   {
     vec3_t v;
@@ -4667,3 +4668,13 @@ void UI_UpdateNews( qboolean begin )
     uiInfo.newsInfo.refreshActive = qfalse;
 }
 
+// missing syscalls
+
+void trap_R_SetClipRegion( const float *region )
+{
+}
+
+qboolean  trap_GetNews( qboolean force )
+{
+	return qfalse;
+}
diff --git a/src/ui/ui_public.h b/src/ui/ui_public.h
index 0fb2292..a70746b 100644
--- a/src/ui/ui_public.h
+++ b/src/ui/ui_public.h
@@ -37,8 +37,7 @@ typedef struct
 }
 uiClientState_t;
 
-typedef enum
-{
+typedef enum {
   UI_ERROR,
   UI_PRINT,
   UI_MILLISECONDS,
@@ -66,7 +65,6 @@ typedef enum
   UI_R_ADDLIGHTTOSCENE,
   UI_R_RENDERSCENE,
   UI_R_SETCOLOR,
-  UI_R_SETCLIPREGION,
   UI_R_DRAWSTRETCHPIC,
   UI_UPDATESCREEN,
   UI_CM_LERPTAG,
@@ -95,6 +93,11 @@ typedef enum
   UI_MEMORY_REMAINING,
   UI_R_REGISTERFONT,
   UI_R_MODELBOUNDS,
+  UI_PARSE_ADD_GLOBAL_DEFINE,
+  UI_PARSE_LOAD_SOURCE,
+  UI_PARSE_FREE_SOURCE,
+  UI_PARSE_READ_TOKEN,
+  UI_PARSE_SOURCE_FILE_AND_LINE,
   UI_S_STOPBACKGROUNDTRACK,
   UI_S_STARTBACKGROUNDTRACK,
   UI_REAL_TIME,
@@ -122,13 +125,6 @@ typedef enum
   UI_FS_SEEK,
   UI_SET_PBCLSTATUS,
 
-  UI_PARSE_ADD_GLOBAL_DEFINE,
-  UI_PARSE_LOAD_SOURCE,
-  UI_PARSE_FREE_SOURCE,
-  UI_PARSE_READ_TOKEN,
-  UI_PARSE_SOURCE_FILE_AND_LINE,
-  UI_GETNEWS,
-
   UI_MEMSET = 100,
   UI_MEMCPY,
   UI_STRNCPY,
@@ -175,12 +171,6 @@ typedef enum
   UI_MOUSE_EVENT,
   //  void  UI_MouseEvent( int dx, int dy );
 
-  UI_MOUSE_POSITION,
-  //  int   UI_MousePosition( void );
-
-  UI_SET_MOUSE_POSITION,
-  //  void  UI_SetMousePosition( int x, int y );
-
   UI_REFRESH,
   //  void  UI_Refresh( int time );
 
@@ -193,12 +183,18 @@ typedef enum
   UI_CONSOLE_COMMAND,
   //  qboolean UI_ConsoleCommand( int realTime );
 
-  UI_DRAW_CONNECT_SCREEN
+  UI_DRAW_CONNECT_SCREEN,
   //  void  UI_DrawConnectScreen( qboolean overlay );
 
   // if !overlay, the background will be drawn, otherwise it will be
   // overlayed over whatever the cgame has drawn.
   // a GetClientState syscall will be made to get the current strings
+
+  UI_MOUSE_POSITION,
+  //  int   UI_MousePosition( void );
+
+  UI_SET_MOUSE_POSITION
+  //  void  UI_SetMousePosition( int x, int y );
 }
 uiExport_t;
 
diff --git a/src/ui/ui_shared.h b/src/ui/ui_shared.h
index 649d51f..6441ce5 100644
--- a/src/ui/ui_shared.h
+++ b/src/ui/ui_shared.h
@@ -529,8 +529,6 @@ void Controls_GetConfig( void );
 void Controls_SetConfig( qboolean restart );
 void Controls_SetDefaults( void );
 
-void trap_R_SetClipRegion( const float *region );
-
 //for cg_draw.c
 void Item_Text_Wrapped_Paint( itemDef_t *item );
 const char *Item_Text_Wrap( const char *text, float scale, float width );
@@ -556,4 +554,5 @@ int      trap_Parse_SourceFileAndLine( int handle, char *filename, int *line );
 void    BindingFromName( const char *cvar );
 extern char g_nameBind1[ 32 ];
 extern char g_nameBind2[ 32 ];
+
 #endif
diff --git a/src/ui/ui_syscalls.asm b/src/ui/ui_syscalls.asm
index 1e797a9..e989ab9 100644
--- a/src/ui/ui_syscalls.asm
+++ b/src/ui/ui_syscalls.asm
@@ -27,68 +27,67 @@ equ trap_R_AddPolyToScene             -24
 equ trap_R_AddLightToScene            -25
 equ trap_R_RenderScene                -26
 equ trap_R_SetColor                   -27
-equ trap_R_SetClipRegion              -28
-equ trap_R_DrawStretchPic             -29
-equ trap_UpdateScreen                 -30
-equ trap_CM_LerpTag                   -31
-equ trap_CM_LoadModel                 -32
-equ trap_S_RegisterSound              -33
-equ trap_S_StartLocalSound            -34
-equ trap_Key_KeynumToStringBuf        -35
-equ trap_Key_GetBindingBuf            -36
-equ trap_Key_SetBinding               -37
-equ trap_Key_IsDown                   -38
-equ trap_Key_GetOverstrikeMode        -39
-equ trap_Key_SetOverstrikeMode        -40
-equ trap_Key_ClearStates              -41
-equ trap_Key_GetCatcher               -42
-equ trap_Key_SetCatcher               -43        
-equ trap_GetClipboardData             -44
-equ trap_GetGlconfig                  -45
-equ trap_GetClientState               -46
-equ trap_GetConfigString              -47
-equ trap_LAN_GetPingQueueCount        -48
-equ trap_LAN_ClearPing                -49
-equ trap_LAN_GetPing                  -50
-equ trap_LAN_GetPingInfo              -51
-equ trap_Cvar_Register                -52
-equ trap_Cvar_Update                  -53
-equ trap_MemoryRemaining              -54
-equ trap_R_RegisterFont               -55
-equ trap_R_ModelBounds                -56
-equ trap_S_StopBackgroundTrack        -57
-equ trap_S_StartBackgroundTrack       -58
-equ trap_RealTime                     -59
-equ trap_LAN_GetServerCount           -60
-equ trap_LAN_GetServerAddressString   -61
-equ trap_LAN_GetServerInfo            -62
-equ trap_LAN_MarkServerVisible        -63
-equ trap_LAN_UpdateVisiblePings       -64
-equ trap_LAN_ResetPings               -65
-equ trap_LAN_LoadCachedServers        -66
-equ trap_LAN_SaveCachedServers        -67
-equ trap_LAN_AddServer                -68
-equ trap_LAN_RemoveServer             -69
-equ trap_CIN_PlayCinematic            -70
-equ trap_CIN_StopCinematic            -71
-equ trap_CIN_RunCinematic             -72
-equ trap_CIN_DrawCinematic            -73
-equ trap_CIN_SetExtents               -74
-equ trap_R_RemapShader                -75
-equ trap_LAN_ServerStatus             -76
-equ trap_LAN_GetServerPing            -77
-equ trap_LAN_ServerIsVisible          -78
-equ trap_LAN_CompareServers           -79
-equ trap_FS_Seek                      -80
-equ trap_SetPbClStatus                -81
 
-equ trap_Parse_AddGlobalDefine        -82
-equ trap_Parse_LoadSource             -83
-equ trap_Parse_FreeSource             -84
-equ trap_Parse_ReadToken              -85
-equ trap_Parse_SourceFileAndLine      -86
+equ trap_R_DrawStretchPic             -28
+equ trap_UpdateScreen                 -29
+equ trap_CM_LerpTag                   -30
+equ trap_CM_LoadModel                 -31
+equ trap_S_RegisterSound              -32
+equ trap_S_StartLocalSound            -33
+equ trap_Key_KeynumToStringBuf        -34
+equ trap_Key_GetBindingBuf            -35
+equ trap_Key_SetBinding               -36
+equ trap_Key_IsDown                   -37
+equ trap_Key_GetOverstrikeMode        -38
+equ trap_Key_SetOverstrikeMode        -39
+equ trap_Key_ClearStates              -40
+equ trap_Key_GetCatcher               -41
+equ trap_Key_SetCatcher               -42
+equ trap_GetClipboardData             -43
+equ trap_GetGlconfig                  -44
+equ trap_GetClientState               -45
+equ trap_GetConfigString              -46
+equ trap_LAN_GetPingQueueCount        -47
+equ trap_LAN_ClearPing                -48
+equ trap_LAN_GetPing                  -49
+equ trap_LAN_GetPingInfo              -50
+equ trap_Cvar_Register                -51
+equ trap_Cvar_Update                  -52
+equ trap_MemoryRemaining              -53
+equ trap_R_RegisterFont               -54
+equ trap_R_ModelBounds                -55
+equ trap_Parse_AddGlobalDefine        -56
+equ trap_Parse_LoadSource             -57
+equ trap_Parse_FreeSource             -58
+equ trap_Parse_ReadToken              -59
+equ trap_Parse_SourceFileAndLine      -60
+equ trap_S_StopBackgroundTrack        -61
+equ trap_S_StartBackgroundTrack       -62
+equ trap_RealTime                     -63
+equ trap_LAN_GetServerCount           -64
+equ trap_LAN_GetServerAddressString   -65
+equ trap_LAN_GetServerInfo            -66
+equ trap_LAN_MarkServerVisible        -67
+equ trap_LAN_UpdateVisiblePings       -68
+equ trap_LAN_ResetPings               -69
+equ trap_LAN_LoadCachedServers        -70
+equ trap_LAN_SaveCachedServers        -71
+equ trap_LAN_AddServer                -72
+equ trap_LAN_RemoveServer             -73
+equ trap_CIN_PlayCinematic            -74
+equ trap_CIN_StopCinematic            -75
+equ trap_CIN_RunCinematic             -76
+equ trap_CIN_DrawCinematic            -77
+equ trap_CIN_SetExtents               -78
+equ trap_R_RemapShader                -79
+equ trap_LAN_ServerStatus             -80
+equ trap_LAN_GetServerPing            -81
+equ trap_LAN_ServerIsVisible          -82
+equ trap_LAN_CompareServers           -83
+equ trap_FS_Seek                      -84
+equ trap_SetPbClStatus                -85
+
 
-equ trap_GetNews                      -87
 
 equ memset                            -101
 equ memcpy                            -102
diff --git a/src/ui/ui_syscalls.c b/src/ui/ui_syscalls.c
index 2187f18..edfeaf3 100644
--- a/src/ui/ui_syscalls.c
+++ b/src/ui/ui_syscalls.c
@@ -197,11 +197,6 @@ void trap_R_SetColor( const float *rgba )
   syscall( UI_R_SETCOLOR, rgba );
 }
 
-void  trap_R_SetClipRegion( const float *region )
-{
-  syscall( UI_R_SETCLIPREGION, region );
-}
-
 void trap_R_DrawStretchPic( float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader )
 {
   syscall( UI_R_DRAWSTRETCHPIC, PASSFLOAT( x ), PASSFLOAT( y ), PASSFLOAT( w ), PASSFLOAT( h ), PASSFLOAT( s1 ), PASSFLOAT( t1 ), PASSFLOAT( s2 ), PASSFLOAT( t2 ), hShader );
@@ -327,11 +322,6 @@ int trap_LAN_ServerStatus( const char *serverAddress, char *serverStatus, int ma
   return syscall( UI_LAN_SERVERSTATUS, serverAddress, serverStatus, maxLen );
 }
 
-qboolean trap_GetNews( qboolean force )
-{
-  return syscall( UI_GETNEWS, force );
-}
-
 void trap_LAN_SaveCachedServers( void )
 {
   syscall( UI_LAN_SAVECACHEDSERVERS );