summaryrefslogtreecommitdiffstats
path: root/src/object/task/taskgungoal.cpp
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/object/task/taskgungoal.cpp
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/object/task/taskgungoal.cpp')
-rw-r--r--src/object/task/taskgungoal.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/object/task/taskgungoal.cpp b/src/object/task/taskgungoal.cpp
index 5a44ade..d4db1c8 100644
--- a/src/object/task/taskgungoal.cpp
+++ b/src/object/task/taskgungoal.cpp
@@ -16,8 +16,6 @@
// taskgungoal.cpp
-#define STRICT
-#define D3D_OVERLOADS
#include <windows.h>
#include <stdio.h>
@@ -104,7 +102,7 @@ Error CTaskGunGoal::Start(float dirV, float dirH)
}
else
{
- speedV = 1.0f/(Abs(m_finalDirV-m_initialDirV)*1.0f);
+ speedV = 1.0f/(fabs(m_finalDirV-m_initialDirV)*1.0f);
}
m_initialDirH = m_object->RetGunGoalH();
@@ -118,10 +116,10 @@ Error CTaskGunGoal::Start(float dirV, float dirH)
}
else
{
- speedH = 1.0f/(Abs(m_finalDirH-m_initialDirH)*1.0f);
+ speedH = 1.0f/(fabs(m_finalDirH-m_initialDirH)*1.0f);
}
- m_speed = Min(speedV, speedH);
+ m_speed = Math::Min(speedV, speedH);
if ( m_finalDirV != m_initialDirV ||
m_finalDirH != m_initialDirH )