X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=matrixlib.c;h=dd6f3c6a348919f14b7620cf2a0ac1daea2e352e;hp=a26b6f13d046644a36c49e59b32b121b77c70f87;hb=ca767b6a14085cfd278eaf6999c0177f75bf19fa;hpb=953f1f8feaa55e272118605371c13bf0f68585da

diff --git a/matrixlib.c b/matrixlib.c
index a26b6f13..dd6f3c6a 100644
--- a/matrixlib.c
+++ b/matrixlib.c
@@ -1,11 +1,9 @@
-#include "quakedef.h"
-
+#include "darkplaces.h"
 #include <math.h>
-#include "matrixlib.h"
 
 #ifdef _MSC_VER
-#pragma warning(disable : 4244)     // LordHavoc: MSVC++ 4 x86, double/float
-#pragma warning(disable : 4305)         // LordHavoc: MSVC++ 6 x86, double/float
+#pragma warning(disable : 4244)     // LadyHavoc: MSVC++ 4 x86, double/float
+#pragma warning(disable : 4305)         // LadyHavoc: MSVC++ 6 x86, double/float
 #endif
 
 const matrix4x4_t identitymatrix =
@@ -890,7 +888,7 @@ void Matrix4x4_CreateFromQuakeEntity(matrix4x4_t *out, double x, double y, doubl
 	}
 }
 
-void Matrix4x4_QuakeToDuke3D(const matrix4x4_t *in, matrix4x4_t *out)
+void Matrix4x4_QuakeToDuke3D(const matrix4x4_t *in, matrix4x4_t *out, double maxShearAngle)
 {
 	// Sorry - this isn't direct at all. We can't just use an alternative to
 	// Matrix4x4_CreateFromQuakeEntity as in some cases the input for
@@ -910,7 +908,7 @@ void Matrix4x4_QuakeToDuke3D(const matrix4x4_t *in, matrix4x4_t *out)
 	scaleleft = VectorNormalizeLength(left);
 	scaleup = VectorNormalizeLength(up);
 	AnglesFromVectors(angles, forward, up, false);
-	AngleVectorsDuke3DFLU(angles, forward, left, up);
+	AngleVectorsDuke3DFLU(angles, forward, left, up, maxShearAngle);
 	VectorScale(forward, scaleforward, forward);
 	VectorScale(left, scaleleft, left);
 	VectorScale(up, scaleup, up);
@@ -1579,7 +1577,7 @@ void Matrix4x4_ToOrigin3Quat4Float(const matrix4x4_t *m, float *origin, float *q
 #endif
 }
 
-// LordHavoc: I got this code from:
+// LadyHavoc: I got this code from:
 //http://www.doom3world.org/phpbb2/viewtopic.php?t=2884
 void Matrix4x4_FromDoom3Joint(matrix4x4_t *m, double ox, double oy, double oz, double x, double y, double z)
 {