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/object/auto/autohuston.cpp | |
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/object/auto/autohuston.cpp')
-rw-r--r-- | src/object/auto/autohuston.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index 6a3202b..9ff5197 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -14,8 +14,6 @@ // * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-#define STRICT
-#define D3D_OVERLOADS
#include <windows.h>
#include <stdio.h>
@@ -221,7 +219,7 @@ void CAutoHuston::Start(int param) bool CAutoHuston::EventProcess(const Event &event)
{
D3DVECTOR speed;
- FPOINT dim;
+ Math::Point dim;
float angle;
int i;
@@ -243,7 +241,7 @@ bool CAutoHuston::EventProcess(const Event &event) for ( i=0 ; i<m_lensTotal ; i++ )
{
if ( m_lens[i].total != 0.0f &&
- Mod(m_time, m_lens[i].total) < m_lens[i].off )
+ Math::Mod(m_time, m_lens[i].total) < m_lens[i].off )
{
if ( m_lens[i].parti != -1 )
{
@@ -278,7 +276,7 @@ bool CAutoHuston::Abort() bool CAutoHuston::CreateInterface(bool bSelect)
{
CWindow* pw;
- FPOINT pos, ddim;
+ Math::Point pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);
|