Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J :

Browse Source 
* Stop using the deprecated drand48().
* Define constants in the cpp file.
This commit is contained in:
jean.chalard
2009-08-22 06:27:03 +00:00
parent 73d27eec05
commit 8f8db8df14
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/GuiPlay.h
+2 -2
View File
@@ -7,8 +7,8 @@
class GuiPlay : public GuiLayer class GuiPlay : public GuiLayer
{ {
public: public:
static const float HORZWIDTH = 300.0f; static const float HORZWIDTH;
static const float VERTHEIGHT = 80.0f; static const float VERTHEIGHT;
typedef vector<CardView*>::iterator iterator; typedef vector<CardView*>::iterator iterator;
protected: protected:
projects/mtg/src/GuiMana.cpp
+12 -12
View File
@@ -34,19 +34,19 @@ ManaIcon::ManaIcon(int color, float x, float y) : Pos(x, y, 0.5, 0.0, 255), f(-1
particleSys->FireAt(x, y); particleSys->FireAt(x, y);
zoomP1 = 0.2 + 0.1 * drand48(); zoomP1 = 0.2 + 0.1 * ((float)rand() / (float)RAND_MAX);
zoomP2 = 0.2 + 0.1 * drand48(); zoomP2 = 0.2 + 0.1 * ((float)rand() / (float)RAND_MAX);
zoomP3 = 2 * M_PI * drand48(); zoomP3 = 2 * M_PI * ((float)rand() / (float)RAND_MAX);
zoomP4 = 2 * M_PI * drand48(); zoomP4 = 2 * M_PI * ((float)rand() / (float)RAND_MAX);
zoomP5 = 0.5 + drand48(); zoomP5 = 0.5 + ((float)rand() / (float)RAND_MAX);
zoomP6 = 0.5 + drand48(); zoomP6 = 0.5 + ((float)rand() / (float)RAND_MAX);
xP1 = 2 * M_PI * drand48(); xP1 = 2 * M_PI * ((float)rand() / (float)RAND_MAX);
xP2 = 5 + 30 * drand48(); xP2 = 5 + 30 * ((float)rand() / (float)RAND_MAX);
xP3 = 0.5 + drand48(); xP3 = 0.5 + ((float)rand() / (float)RAND_MAX);
yP1 = 2 * M_PI * drand48(); yP1 = 2 * M_PI * ((float)rand() / (float)RAND_MAX);
yP2 = 5 + 10 * drand48(); yP2 = 5 + 10 * ((float)rand() / (float)RAND_MAX);
yP3 = 0.5 + drand48(); yP3 = 0.5 + ((float)rand() / (float)RAND_MAX);
actT = 0; actT = 0;
tP1 = 0; tP1 = 0;
projects/mtg/src/GuiPlay.cpp
+3
View File
@@ -4,6 +4,9 @@
#define CARD_WIDTH (31) #define CARD_WIDTH (31)
const float GuiPlay::HORZWIDTH = 300.0f;
const float GuiPlay::VERTHEIGHT = 80.0f;
void GuiPlay::CardStack::reset(float x, float y) void GuiPlay::CardStack::reset(float x, float y)
{ {
this->x = 0; baseX = x; this->x = 0; baseX = x;