summaryrefslogtreecommitdiffstats
path: root/src/ui/displaytext.h
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/ui/displaytext.h
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/ui/displaytext.h')
-rw-r--r--src/ui/displaytext.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h
index 381e2f6..f0c6992 100644
--- a/src/ui/displaytext.h
+++ b/src/ui/displaytext.h
@@ -53,16 +53,16 @@ public:
bool EventProcess(const Event &event);
void DisplayError(Error err, CObject* pObj, float time=10.0f);
- void DisplayError(Error err, D3DVECTOR goal, float height=15.0f, float dist=60.0f, float time=10.0f);
+ void DisplayError(Error err, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f);
void DisplayText(char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
- void DisplayText(char *text, D3DVECTOR goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
+ void DisplayText(char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
void HideText(bool bHide);
void ClearText();
bool ClearLastText();
void SetDelay(float factor);
void SetEnable(bool bEnable);
- D3DVECTOR RetVisitGoal(EventMsg event);
+ Math::Vector RetVisitGoal(EventMsg event);
float RetVisitDist(EventMsg event);
float RetVisitHeight(EventMsg event);
@@ -84,7 +84,7 @@ protected:
bool m_bExist[MAXDTLINE];
float m_time[MAXDTLINE];
- D3DVECTOR m_visitGoal[MAXDTLINE];
+ Math::Vector m_visitGoal[MAXDTLINE];
float m_visitDist[MAXDTLINE];
float m_visitHeight[MAXDTLINE];