diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-19 20:11:47 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-19 20:11:47 +0200 |
commit | 9f784e81f81651bed087902f9f3afee113e56148 (patch) | |
tree | ae89f6dabe2443b39aba292673027d197fc120e6 /src/object/task/taskinfo.cpp | |
parent | b8027ce9a7f050b95846a668a02f5801331e127f (diff) | |
download | colobot-9f784e81f81651bed087902f9f3afee113e56148.tar.gz colobot-9f784e81f81651bed087902f9f3afee113e56148.tar.bz2 colobot-9f784e81f81651bed087902f9f3afee113e56148.zip |
Switched to new implementation of the rest of math module
- changed structs from D3DVECTOR to Math::Vector
and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
Diffstat (limited to 'src/object/task/taskinfo.cpp')
-rw-r--r-- | src/object/task/taskinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 3548426..7ce0a36 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -75,7 +75,7 @@ Error CTaskInfo::Start(char *name, float value, float power, bool bSend) {
CObject* pInfo;
CAutoInfo* pAuto;
- D3DVECTOR pos, goal;
+ Math::Vector pos, goal;
Info info;
int i, total, op;
@@ -196,7 +196,7 @@ bool CTaskInfo::Abort() CObject* CTaskInfo::SearchInfo(float power)
{
CObject *pObj, *pBest;
- D3DVECTOR iPos, oPos;
+ Math::Vector iPos, oPos;
ObjectType type;
float dist, min;
int i;
@@ -216,7 +216,7 @@ CObject* CTaskInfo::SearchInfo(float power) if ( !pObj->RetActif() ) continue;
oPos = pObj->RetPosition(0);
- dist = Length(oPos, iPos);
+ dist = Math::Distance(oPos, iPos);
if ( dist > power ) continue; // too far?
if ( dist < min )
{
|