diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/ui/mainmap.cpp | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2 colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip |
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
Diffstat (limited to 'src/ui/mainmap.cpp')
-rw-r--r-- | src/ui/mainmap.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 72452d8..2b05775 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -16,8 +16,6 @@ // mainmap.cpp
-#define STRICT
-#define D3D_OVERLOADS
#include <windows.h>
#include <stdio.h>
@@ -72,7 +70,7 @@ CMainMap::~CMainMap() void CMainMap::CreateMap()
{
CWindow* pw;
- FPOINT pos, dim;
+ Math::Point pos, dim;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1);
if ( pw == 0 )
@@ -169,7 +167,7 @@ void CMainMap::DimMap() CWindow* pw;
CMap* pm;
CSlider* ps;
- FPOINT pos, dim;
+ Math::Point pos, dim;
float value;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1);
@@ -369,7 +367,7 @@ bool CMainMap::RetFixImage() // The object is detected in the mini-map.
-CObject* CMainMap::DetectMap(FPOINT pos, bool &bInMap)
+CObject* CMainMap::DetectMap(Math::Point pos, bool &bInMap)
{
CWindow* pw;
CMap* pm;
|