3 files changed, 9 insertions, 5 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 8f4c2e5c..45f1e8dd 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -1298,6 +1298,7 @@ void CG_Buildable( centity_t *cent )
       VectorCopy( cent->buildableCache.axis[ 0 ], ent.axis[ 0 ] );
       VectorCopy( cent->buildableCache.axis[ 1 ], ent.axis[ 1 ] );
       VectorCopy( cent->buildableCache.axis[ 2 ], ent.axis[ 2 ] );
+      VectorCopy( cent->buildableCache.origin, ent.origin );
     }
     else
     {
@@ -1307,6 +1308,7 @@ void CG_Buildable( centity_t *cent )
       VectorCopy( ent.axis[ 0 ], cent->buildableCache.axis[ 0 ] );
       VectorCopy( ent.axis[ 1 ], cent->buildableCache.axis[ 1 ] );
       VectorCopy( ent.axis[ 2 ], cent->buildableCache.axis[ 2 ] );
+      VectorCopy( ent.origin, cent->buildableCache.origin );
       VectorCopy( cent->lerpOrigin, cent->buildableCache.cachedOrigin );
       VectorCopy( surfNormal, cent->buildableCache.cachedNormal );
     }
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index b8b055b9..3a057b3e 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -191,11 +191,11 @@ static void CG_TellAttacker_f( void )
 static void CG_SquadMark_f( void )
 {
   centity_t *cent;
-  vec3_t start, end;
+  vec3_t end;
   trace_t trace;
   
   // Find the player we are looking at
-  VectorMA( cg.refdef.vieworg, 4096, cg.refdef.viewaxis[ 0 ], end );
+  VectorMA( cg.refdef.vieworg, 131072, cg.refdef.viewaxis[ 0 ], end );
   CG_Trace( &trace, cg.refdef.vieworg, NULL, NULL, end,
             cg.snap->ps.clientNum, CONTENTS_SOLID | CONTENTS_BODY );
   if( trace.entityNum >= MAX_CLIENTS )
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 051a091b..3687e195 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -2274,11 +2274,11 @@ CG_DrawSquadMarkers
 static void CG_DrawSquadMarkers( vec4_t color )
 {
   centity_t *cent;
-  vec3_t origin, maxs;
+  vec3_t origin;
   qhandle_t shader;
   float x, y, w, h, distance, scale, u1 = 0.0f, v1 = 0.0f, u2 = 1.0f, v2 = 1.0f;
-  int i, class;
-  qboolean vertical = qfalse, flip = qfalse;
+  int i;
+  qboolean vertical, flip;
   
   if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
     return;
@@ -2313,6 +2313,8 @@ static void CG_DrawSquadMarkers( vec4_t color )
       scale = 0.25f;
     
     // Don't let the marker go off-screen
+    vertical = qfalse;
+    flip = qfalse;
     if( x < SQUAD_MARKER_BORDER )
     {
       x = SQUAD_MARKER_BORDER;