From 59e146a1be41322a8164b271ffc76396fce3e08b Mon Sep 17 00:00:00 2001
From: Michael Levin <risujin@fastmail.fm>
Date: Sat, 3 Oct 2009 11:32:56 +0000
Subject: * A new (256x256) version of Garoth's creep texture * Hooray for
 physics! 0 = (k v_i)^2 + 2ad --> k^2 v_i^2 / 2a = d, i.e. the minijump scale
 is sqrt(1/2) for a half-jump * Oops, forgot to store/restore computed origin
 for cached buildable cap-traces * Seeing multiple marked players will not
 mess up the marker orientations anymore * Fixed warnings and increased range
 of squad marking to player crosshair distance

---
 src/cgame/cg_buildable.c   | 2 ++
 src/cgame/cg_consolecmds.c | 4 ++--
 src/cgame/cg_draw.c        | 8 +++++---
 src/game/tremulous.h       | 2 +-
 4 files changed, 10 insertions(+), 6 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;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 250922d5..e2723529 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -357,7 +357,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ALIEN_CREDITS_PER_FRAG      400
 #define ALIEN_TK_SUICIDE_PENALTY    350
 
-#define ALIEN_MINI_JUMP_SCALE       0.667f // scales jump magnitude for a mini-jump
+#define ALIEN_MINI_JUMP_SCALE       0.71f // scales jump magnitude for a mini-jump
 
 // Uncomment to allow Aliens to wallwalk on any entity (buildables, players, etc)
 //#define ALIEN_WALLWALK_ENTITIES
-- 
cgit