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/ui/maindialog.h | |
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/ui/maindialog.h')
-rw-r--r-- | src/ui/maindialog.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index 9173dde..5819cf8 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -92,7 +92,7 @@ public: void StartDeleteObject();
void StartDeleteGame(char *gamer);
void StartQuit();
- void StartDialog(FPOINT dim, bool bFire, bool bOK, bool bCancel);
+ void StartDialog(Math::Point dim, bool bFire, bool bOK, bool bCancel);
void FrameDialog(float rTime);
void StopDialog();
bool IsDialog();
@@ -129,7 +129,7 @@ public: protected:
void GlintMove();
void FrameParticule(float rTime);
- void NiceParticule(FPOINT mouse, bool bPress);
+ void NiceParticule(Math::Point mouse, bool bPress);
void ReadNameList();
void UpdateNameList();
void UpdateNameEdit();
@@ -228,7 +228,7 @@ protected: bool m_bCameraInvertY; // for CCamera
bool m_bEffect; // for CCamera
- FPOINT m_glintMouse;
+ Math::Point m_glintMouse;
float m_glintTime;
int m_loadingCounter;
@@ -236,8 +236,8 @@ protected: bool m_bDialog; // this dialogue?
bool m_bDialogFire; // setting on fire?
bool m_bDialogDelete;
- FPOINT m_dialogPos;
- FPOINT m_dialogDim;
+ Math::Point m_dialogPos;
+ Math::Point m_dialogDim;
float m_dialogParti;
float m_dialogTime;
bool m_bInitPause;
@@ -245,7 +245,7 @@ protected: int m_partiPhase[10];
float m_partiTime[10];
- FPOINT m_partiPos[10];
+ Math::Point m_partiPos[10];
SceneInfo m_sceneInfo[MAXSCENE];
};
|