summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2014-06-17 17:43:05 +0100
committerTim Angus <tim@ngus.net>2014-06-17 17:43:43 +0100
commit77c45fa12305eb8c977c5c7803f6cb1f24ce4ec4 (patch)
treeec9324ad73575a42b2eec5050a746b07aa26989d /src/qcommon
parent1193e49c35fdd0ea24f21c6dff74b5b2cd074c3b (diff)
Various adjustments so it compiles
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/q_shared.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index e3b1a48e..3f4f0780 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -526,7 +526,7 @@ void ByteToDir( int b, vec3_t dir );
#define VectorCopy(a,b) ((b)[0]=(a)[0],(b)[1]=(a)[1],(b)[2]=(a)[2])
#define VectorScale(v, s, o) ((o)[0]=(v)[0]*(s),(o)[1]=(v)[1]*(s),(o)[2]=(v)[2]*(s))
#define VectorMA(v, s, b, o) ((o)[0]=(v)[0]+(b)[0]*(s),(o)[1]=(v)[1]+(b)[1]*(s),(o)[2]=(v)[2]+(b)[2]*(s))
-#define VectorLerp( f, s, e, r ) ((r)[0]=(s)[0]+(f)*((e)[0]-(s)[0]),\
+#define VectorLerp2( f, s, e, r ) ((r)[0]=(s)[0]+(f)*((e)[0]-(s)[0]),\
(r)[1]=(s)[1]+(f)*((e)[1]-(s)[1]),\
(r)[2]=(s)[2]+(f)*((e)[2]-(s)[2]))