summaryrefslogtreecommitdiffstats
path: root/src/common/modfile.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/common/modfile.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/common/modfile.cpp')
-rw-r--r--src/common/modfile.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp
index ddda0d8..79d6612 100644
--- a/src/common/modfile.cpp
+++ b/src/common/modfile.cpp
@@ -16,8 +16,6 @@
// modfile.cpp
-#define STRICT
-#define D3D_OVERLOADS
#include <windows.h>
#include <stdio.h>
@@ -671,20 +669,20 @@ float CModFile::RetHeight(D3DVECTOR pos)
{
if ( !m_triangleTable[i].bUsed ) continue;
- if ( Abs(pos.x-m_triangleTable[i].p1.x) < limit &&
- Abs(pos.z-m_triangleTable[i].p1.z) < limit )
+ if ( fabs(pos.x-m_triangleTable[i].p1.x) < limit &&
+ fabs(pos.z-m_triangleTable[i].p1.z) < limit )
{
return m_triangleTable[i].p1.y;
}
- if ( Abs(pos.x-m_triangleTable[i].p2.x) < limit &&
- Abs(pos.z-m_triangleTable[i].p2.z) < limit )
+ if ( fabs(pos.x-m_triangleTable[i].p2.x) < limit &&
+ fabs(pos.z-m_triangleTable[i].p2.z) < limit )
{
return m_triangleTable[i].p2.y;
}
- if ( Abs(pos.x-m_triangleTable[i].p3.x) < limit &&
- Abs(pos.z-m_triangleTable[i].p3.z) < limit )
+ if ( fabs(pos.x-m_triangleTable[i].p3.x) < limit &&
+ fabs(pos.z-m_triangleTable[i].p3.z) < limit )
{
return m_triangleTable[i].p3.y;
}