From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 6 Nov 2011 14:24:59 +0000 (+0000)
Subject: fix showtex
X-Git-Tag: xonotic-v0.6.0~163^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db7d2f7ea9647a7b119054141755aedf752e8719;p=xonotic%2Fdarkplaces.git

fix showtex

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11530 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sbar.c b/sbar.c
index 43a1b93d..fd242066 100644
--- a/sbar.c
+++ b/sbar.c
@@ -1211,14 +1211,18 @@ void Sbar_ShowFPS(void)
 	}
 	if (showtex.integer)
 	{
+		vec3_t org;
 		vec3_t dest;
+		vec3_t temp;
 		trace_t trace;
 
-		VectorMA(r_refdef.view.origin, 65536, r_refdef.view.forward, dest);
+		Matrix4x4_OriginFromMatrix(&r_refdef.view.matrix, org);
+		VectorSet(temp, 65536, 0, 0);
+		Matrix4x4_Transform(&r_refdef.view.matrix, temp, dest);
 		trace.hittexture = NULL; // to make sure
 		// TODO change this trace to be stopped by anything "visible" (i.e. with a drawsurface), but not stuff like weapclip
 		// probably needs adding a new SUPERCONTENTS type
-		trace = CL_TraceLine(r_refdef.view.origin, dest, MOVE_NORMAL, NULL, SUPERCONTENTS_SOLID, true, false, NULL, true, true);
+		trace = CL_TraceLine(org, dest, MOVE_NORMAL, NULL, SUPERCONTENTS_SOLID, true, false, NULL, true, true);
 		if(trace.hittexture)
 			strlcpy(texstring, trace.hittexture->name, sizeof(texstring));
 		else