summaryrefslogtreecommitdiffstats
path: root/src/script/cmdtoken.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-19 20:11:47 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-19 20:11:47 +0200
commit9f784e81f81651bed087902f9f3afee113e56148 (patch)
treeae89f6dabe2443b39aba292673027d197fc120e6 /src/script/cmdtoken.cpp
parentb8027ce9a7f050b95846a668a02f5801331e127f (diff)
downloadcolobot-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/script/cmdtoken.cpp')
-rw-r--r--src/script/cmdtoken.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp
index b370343..70d1a7b 100644
--- a/src/script/cmdtoken.cpp
+++ b/src/script/cmdtoken.cpp
@@ -906,14 +906,14 @@ int OpBuild(char *line, char *op)
// Returns a position in the XZ plane (top view).
-D3DVECTOR OpPos(char *line, char *op)
+Math::Vector OpPos(char *line, char *op)
{
- D3DVECTOR pos;
+ Math::Vector pos;
line = SearchOp(line, op);
if ( *line == 0 )
{
- pos = D3DVECTOR(0.0f, 0.0f, 0.0f);
+ pos = Math::Vector(0.0f, 0.0f, 0.0f);
return pos;
}
pos.x = GetFloat(line, 0, 0.0f);
@@ -924,14 +924,14 @@ D3DVECTOR OpPos(char *line, char *op)
// Returns a direction.
-D3DVECTOR OpDir(char *line, char *op)
+Math::Vector OpDir(char *line, char *op)
{
- D3DVECTOR dir;
+ Math::Vector dir;
line = SearchOp(line, op);
if ( *line == 0 )
{
- dir = D3DVECTOR(0.0f, 0.0f, 0.0f);
+ dir = Math::Vector(0.0f, 0.0f, 0.0f);
return dir;
}
dir.x = GetFloat(line, 0, 0.0f);