[Scummvm-cvs-logs] CVS: residual Makefile,1.4,1.5 matrix3.cpp,1.1,1.2 matrix3.h,1.1,1.2 matrix4.cpp,1.1,1.2 matrix4.h,1.1,1.2

[Vincent Hamm]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv30728

Modified Files:
	Makefile matrix3.cpp matrix3.h matrix4.cpp matrix4.h 
Log Message:
fix compile under linux


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	21 Aug 2003 15:42:36 -0000	1.4
+++ Makefile	28 Aug 2003 02:01:48 -0000	1.5
@@ -5,7 +5,8 @@
 
 OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
 	textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
-	sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o
+	sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
+	matrix3.o matrix4.o
 
 DEPS = $(OBJS:.o=.d)
 

Index: matrix3.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix3.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matrix3.cpp	28 Aug 2003 01:55:48 -0000	1.1
+++ matrix3.cpp	28 Aug 2003 02:01:48 -0000	1.2
@@ -1,14 +1,14 @@
 #include <math.h>
 #include "matrix3.h"
 
-Matrix3::setAsIdentity( void )
+void Matrix3::setAsIdentity( void )
 {
 	right_.set(1.f, 0.f, 0.f);
 	up_.set(0.f, 1.f, 0.f);
 	at_.set(0.f, 0.f, 0.f);
 }
 
-Matrix3::buildFromPitchYawRoll( float pitch, float yaw, float roll )
+void Matrix3::buildFromPitchYawRoll( float pitch, float yaw, float roll )
 {
     Matrix3 temp1, temp2;
 
@@ -37,7 +37,7 @@
 }
 
 // right
-Matrix3::constructAroundPitch( float pitch )
+void Matrix3::constructAroundPitch( float pitch )
 {
 	float cosa;
 	float sina;
@@ -51,7 +51,7 @@
 }
 
 // up
-Matrix3::constructAroundYaw( float yaw )
+void Matrix3::constructAroundYaw( float yaw )
 {
 	float cosa;
 	float sina;
@@ -65,7 +65,7 @@
 }
 
 // at
-Matrix3::constructAroundRoll( float roll )
+void Matrix3::constructAroundRoll( float roll )
 {
 	float cosa;
 	float sina;
@@ -175,3 +175,4 @@
 
 	v.set( x, y, z );
 }
+

Index: matrix3.h
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix3.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matrix3.h	28 Aug 2003 01:55:48 -0000	1.1
+++ matrix3.h	28 Aug 2003 02:01:48 -0000	1.2
@@ -27,12 +27,12 @@
     Vector3d up_;
     Vector3d at_;
 
-	buildFromPitchYawRoll( float pitch, float yaw, float roll );
-	setAsIdentity(void);
+	void buildFromPitchYawRoll( float pitch, float yaw, float roll );
+	void setAsIdentity(void);
 
-	constructAroundPitch( float pitch );
-	constructAroundYaw( float pitch );
-	constructAroundRoll( float pitch );
+	void constructAroundPitch( float pitch );
+	void constructAroundYaw( float pitch );
+	void constructAroundRoll( float pitch );
 
 	void getPitchYawRoll( float* pPitch, float* pYaw, float* pRoll );
 
@@ -79,4 +79,5 @@
 private:
 };
 
-#endif // MATRIX_HH
\ No newline at end of file
+#endif // MATRIX_HH
+

Index: matrix4.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix4.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matrix4.cpp	28 Aug 2003 01:55:48 -0000	1.1
+++ matrix4.cpp	28 Aug 2003 02:01:48 -0000	1.2
@@ -15,4 +15,5 @@
 	rot_.transform( v );
 
 	pos_ += v;
-}
\ No newline at end of file
+}
+

Index: matrix4.h
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix4.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matrix4.h	28 Aug 2003 01:55:48 -0000	1.1
+++ matrix4.h	28 Aug 2003 02:01:48 -0000	1.2
@@ -56,4 +56,5 @@
 private:
 };
 
-#endif // MATRIX_HH
\ No newline at end of file
+#endif // MATRIX_HH
+