From b735913debff93c1a6444ec731cd4bf99ae2a5c2 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 13 Jun 2012 22:48:35 +0200 Subject: 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 --- src/ui/target.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/ui/target.cpp') diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 4e282b9..0f18efd 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -16,8 +16,6 @@ // target.cpp -#define STRICT -#define D3D_OVERLOADS #include #include @@ -52,7 +50,7 @@ CTarget::~CTarget() // Creates a new button. -bool CTarget::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) +bool CTarget::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg) { if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg(); @@ -161,7 +159,7 @@ void CTarget::Draw() // Returns the tooltip. -bool CTarget::GetTooltip(FPOINT pos, char* name) +bool CTarget::GetTooltip(Math::Point pos, char* name) { #if 0 if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window? @@ -194,7 +192,7 @@ bool CTarget::GetTooltip(FPOINT pos, char* name) // Detects the object aimed by the mouse. -CObject* CTarget::DetectFriendObject(FPOINT pos) +CObject* CTarget::DetectFriendObject(Math::Point pos) { ObjectType type; CObject *pObj, *pTarget; -- cgit v1.2.3-1-g7c22