FPOINT -> Math::Point & other math functions

- changed FPOINT to Math::Point and some functions
  from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options

1 files changed, 10 insertions, 10 deletions

diff --git a/src/object/task/task.h b/src/object/task/task.h
index 97ac819..1d123a3 100644
--- a/src/object/task/task.h
+++ b/src/object/task/task.h
@@ -20,7 +20,7 @@
 

 

 #include "common/misc.h"

-#include "math/old/math3d.h"

+#include "math/const.h"

 

 

 class CInstanceManager;

@@ -43,16 +43,16 @@ class CSound;
 const float TAKE_DIST		= 6.0f;	// distance to an object to pick it

 const float TAKE_DIST_OTHER	= 1.5f;	// additional distance if on friend

 

-//?const float ARM_NEUTRAL_ANGLE1 = 155.0f*PI/180.0f;

-//?const float ARM_NEUTRAL_ANGLE2 = -125.0f*PI/180.0f;

-//?const float ARM_NEUTRAL_ANGLE3 = -45.0f*PI/180.0f;

-const float ARM_NEUTRAL_ANGLE1 = 110.0f*PI/180.0f;

-const float ARM_NEUTRAL_ANGLE2 = -130.0f*PI/180.0f;

-const float ARM_NEUTRAL_ANGLE3 = -50.0f*PI/180.0f;

+//?const float ARM_NEUTRAL_ANGLE1 = 155.0f*Math::PI/180.0f;

+//?const float ARM_NEUTRAL_ANGLE2 = -125.0f*Math::PI/180.0f;

+//?const float ARM_NEUTRAL_ANGLE3 = -45.0f*Math::PI/180.0f;

+const float ARM_NEUTRAL_ANGLE1 = 110.0f*Math::PI/180.0f;

+const float ARM_NEUTRAL_ANGLE2 = -130.0f*Math::PI/180.0f;

+const float ARM_NEUTRAL_ANGLE3 = -50.0f*Math::PI/180.0f;

 

-const float ARM_STOCK_ANGLE1 = 110.0f*PI/180.0f;

-const float ARM_STOCK_ANGLE2 = -100.0f*PI/180.0f;

-const float ARM_STOCK_ANGLE3 = -70.0f*PI/180.0f;

+const float ARM_STOCK_ANGLE1 = 110.0f*Math::PI/180.0f;

+const float ARM_STOCK_ANGLE2 = -100.0f*Math::PI/180.0f;

+const float ARM_STOCK_ANGLE3 = -70.0f*Math::PI/180.0f;

 

 

 class CTask