removed some compiler warnings
changed variables to float where appropriate
This commit is contained in:
@@ -18,8 +18,8 @@ class MenuItem: public JGuiObject
|
||||
bool mHasFocus;
|
||||
WFont *mFont;
|
||||
string mText;
|
||||
int mX;
|
||||
int mY;
|
||||
float mX;
|
||||
float mY;
|
||||
int updatedSinceLastRender;
|
||||
float lastDt;
|
||||
|
||||
@@ -31,7 +31,7 @@ class MenuItem: public JGuiObject
|
||||
|
||||
|
||||
public:
|
||||
MenuItem(int id, WFont *font, string text, int x, int y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleQuad, bool hasFocus = false);
|
||||
MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleQuad, bool hasFocus = false);
|
||||
~MenuItem();
|
||||
virtual void Render();
|
||||
virtual void Update(float dt);
|
||||
|
||||
@@ -18,7 +18,7 @@ protected:
|
||||
float mY;
|
||||
float start;
|
||||
int timer;
|
||||
int minimumItems;
|
||||
size_t minimumItems;
|
||||
|
||||
vector<string> strings;
|
||||
unsigned int currentId;
|
||||
@@ -29,7 +29,7 @@ public:
|
||||
void Add(string text);
|
||||
void Reset();
|
||||
void setRandom(int mode = 1);
|
||||
TextScroller(int fontId, float x, float y, float width, float speed = 30, int scrollerType = 0, int _minimumItems = 2);
|
||||
TextScroller(int fontId, float x, float y, float width, float speed = 30, int scrollerType = 0, size_t _minimumItems = 2);
|
||||
void Render();
|
||||
void Update(float dt);
|
||||
virtual ostream& toString(ostream& out) const;
|
||||
|
||||
Reference in New Issue
Block a user