Merge branch 'master' of harrygodden.com:/home/fishladder into master

[fishladder.git] / vg / vg_m.h

diff --git a/vg/vg_m.h b/vg/vg_m.h
index a0c01077048b0a5cd599f206e428b474ca3af1d9..6276edb814bdb23bb0b83e036698ebf4b9d9513a 100644 (file)
--- a/vg/vg_m.h
+++ b/vg/vg_m.h
@@ -55,6 +55,11 @@ static inline void v2i_copy( v2i a, v2i b )
        b[0] = a[0]; b[1] = a[1];
 }
 
+static inline int v2i_eq( v2i a, v2i b )
+{
+       return ((a[0] == b[0]) && (a[1] == b[1]));
+}
+
 static inline void v2i_add( v2i a, v2i b, v2i d )
 {
        d[0] = a[0]+b[0]; d[1] = a[1]+b[1];
@@ -227,7 +232,7 @@ static inline void v3_normalize( v3f a )
        v3_muls( a, 1.f / v3_length( a ), a );
 }
 
-static inline float csr_lerpf( float a, float b, float t )
+static inline float vg_lerpf( float a, float b, float t )
 {
        return a + t*(b-a);
 }