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, 7 insertions, 9 deletions

diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp
index a4e2131..5921453 100644
--- a/src/ui/displayinfo.cpp
+++ b/src/ui/displayinfo.cpp
@@ -16,8 +16,6 @@
 

 // displayinfo.cpp

 

-#define STRICT

-#define D3D_OVERLOADS

 

 #include <windows.h>

 #include <stdio.h>

@@ -70,8 +68,8 @@ CDisplayInfo::CDisplayInfo(CInstanceManager* iMan)
 	m_bInfoMaximized = true;

 	m_bInfoMinimized = false;

 

-	m_infoFinalPos = m_infoActualPos = m_infoNormalPos = FPOINT(0.00f, 0.00f);

-	m_infoFinalDim = m_infoActualPos = m_infoNormalDim = FPOINT(1.00f, 1.00f);

+	m_infoFinalPos = m_infoActualPos = m_infoNormalPos = Math::Point(0.00f, 0.00f);

+	m_infoFinalDim = m_infoActualPos = m_infoNormalDim = Math::Point(1.00f, 1.00f);

 

 	m_lightSuppl = -1;

 	m_toto = 0;

@@ -339,7 +337,7 @@ void CDisplayInfo::HyperUpdate()
 void CDisplayInfo::StartDisplayInfo(char *filename, int index, bool bSoluce)

 {

 	D3DLIGHT7		light;

-	FPOINT			pos, dim;

+	Math::Point			pos, dim;

 	CWindow*		pw;

 	CEdit*			edit;

 	CButton*		button;

@@ -375,7 +373,7 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, bool bSoluce)
 //?	pw->SetClosable(true);

 //?	GetResource(RES_TEXT, RT_DISINFO_TITLE, res);

 //?	pw->SetName(res);

-//?	pw->SetMinDim(FPOINT(0.56f, 0.40f));

+//?	pw->SetMinDim(Math::Point(0.56f, 0.40f));

 //?	pw->SetMaximized(m_bInfoMaximized);

 //?	pw->SetMinimized(m_bInfoMinimized);

 //?	m_main->SetEditFull(m_bInfoMaximized);

@@ -476,14 +474,14 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, bool bSoluce)
 

 // Repositions all controls editing.

 

-void CDisplayInfo::AdjustDisplayInfo(FPOINT wpos, FPOINT wdim)

+void CDisplayInfo::AdjustDisplayInfo(Math::Point wpos, Math::Point wdim)

 {

 	CWindow*	pw;

 	CEdit*		edit;

 	CButton*	button;

 	CSlider*	slider;

 	CGroup*		group;

-	FPOINT		pos, dim;

+	Math::Point		pos, dim;

 

 	wpos.x =  50.0f/640.0f;

 	wpos.y =  30.0f/480.0f;

@@ -696,7 +694,7 @@ void CDisplayInfo::UpdateIndexButton()
 	CButton*	button;

 	CGroup*		group;

 	CEdit*		edit;

-	FPOINT		pos, dim;

+	Math::Point		pos, dim;

 	char*		filename;

 	char*		loading;