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.h | |
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.h')
-rw-r--r-- | src/ui/mainmap.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index 1c0e1fd..6b10d94 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -19,6 +19,10 @@ #pragma once
+#include "common/struct.h"
+#include "math/point.h"
+
+
class CInstanceManager;
class CEvent;
class CD3DEngine;
@@ -45,7 +49,7 @@ public: void MapEnable(bool bEnable);
bool RetShowMap();
bool RetFixImage();
- CObject* DetectMap(FPOINT pos, bool &bInMap);
+ CObject* DetectMap(Math::Point pos, bool &bInMap);
void SetHilite(CObject* pObj);
void SetToy(bool bToy);
void SetFixParam(float zoom, float ox, float oy, float angle, int mode, bool bDebug);
|