summaryrefslogtreecommitdiffstats
path: root/src/ui/mainshort.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
commitb735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch)
treeefa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/ui/mainshort.h
parentb5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff)
downloadcolobot-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/mainshort.h')
-rw-r--r--src/ui/mainshort.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h
index 1b507d4..82b0253 100644
--- a/src/ui/mainshort.h
+++ b/src/ui/mainshort.h
@@ -19,8 +19,11 @@
#pragma once
+#include "common/event.h"
+#include "math/point.h"
+
+
class CInstanceManager;
-class CEvent;
class CD3DEngine;
class CInterface;
class CRobotMain;
@@ -40,7 +43,7 @@ public:
bool UpdateShortcuts();
void SelectShortcut(EventMsg event);
void SelectNext();
- CObject* DetectShort(FPOINT pos);
+ CObject* DetectShort(Math::Point pos);
void SetHilite(CObject* pObj);
protected: