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

diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp
index c68f21c..5d574e4 100644
--- a/src/ui/mainshort.cpp
+++ b/src/ui/mainshort.cpp
@@ -16,8 +16,6 @@
 

 // mainshort.cpp

 

-#define STRICT

-#define D3D_OVERLOADS

 

 #include <windows.h>

 #include <stdio.h>

@@ -111,7 +109,7 @@ bool CMainShort::CreateShortcuts()
 	CObject*	pObj;

 	CControl*	pc;

 	ObjectType	type;

-	FPOINT		pos, dim;

+	Math::Point		pos, dim;

 	int			i, rank, icon;

 	char		name[100];

 

@@ -319,10 +317,10 @@ void CMainShort::SelectNext()
 

 // The object detected by the mouse hovers over.

 

-CObject* CMainShort::DetectShort(FPOINT pos)

+CObject* CMainShort::DetectShort(Math::Point pos)

 {

 	CControl*	pc;

-	FPOINT		cpos, cdim;

+	Math::Point		cpos, cdim;

 	int			i;

 

 	for ( i=0 ; i<20 ; i++ )