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, 5 insertions, 6 deletions

diff --git a/src/ui/scroll.h b/src/ui/scroll.h
index 67dc543..26b8d9b 100644
--- a/src/ui/scroll.h
+++ b/src/ui/scroll.h
@@ -20,7 +20,6 @@
 

 

 #include "ui/control.h"

-#include "common/struct.h"

 

 

 class CD3DEngine;

@@ -37,10 +36,10 @@ public:
 	CScroll(CInstanceManager* iMan);

 	~CScroll();

 

-	bool		Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

+	bool		Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);

 

-	void		SetPos(FPOINT pos);

-	void		SetDim(FPOINT dim);

+	void		SetPos(Math::Point pos);

+	void		SetDim(Math::Point dim);

 

 	bool		SetState(int state, bool bState);

 	bool		SetState(int state);

@@ -61,7 +60,7 @@ public:
 protected:

 	void		MoveAdjust();

 	void		AdjustGlint();

-	void		DrawVertex(FPOINT pos, FPOINT dim, int icon);

+	void		DrawVertex(Math::Point pos, Math::Point dim, int icon);

 

 protected:

 	CButton*	m_buttonUp;

@@ -72,7 +71,7 @@ protected:
 	float		m_step;

 

 	bool		m_bCapture;

-	FPOINT		m_pressPos;

+	Math::Point		m_pressPos;

 	float		m_pressValue;

 

 	EventMsg	m_eventUp;