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

More type conversion warning fixes, with some minor refactoring thrown in.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-10-14 07:39:00 +00:00
parent 3ca5a7261d
commit f7361fb030
5 changed files with 93 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/MTGDefinitions.h
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef _MTGDEFINITION_H_
#define _MTGDEFINITION_H_
#define DEFAULT_MENU_FONT_SCALE 1.0
#define DEFAULT_MAIN_FONT_SCALE 1.0
#define DEFAULT_TEXT_FONT_SCALE 1.0
const float DEFAULT_MENU_FONT_SCALE = 1.0f;
const float DEFAULT_MAIN_FONT_SCALE = 1.0f;
const float DEFAULT_TEXT_FONT_SCALE = 1.0f;
class Constants
{
projects/mtg/include/PlayGuiObject.h
+1 -1
View File
@@ -34,7 +34,7 @@ class PlayGuiObject: public JGuiObject, public JGuiListener, public Pos{
PlayGuiObject(float desiredHeight, float x, float y, bool hasFocus);
PlayGuiObject(float desiredHeight, const Pos& ref, bool hasFocus);
virtual void ButtonPressed(int controllerId, int controlId){};
virtual bool getTopLeft(int& top, int& left) {top = actY; left = actX; return true;};
virtual bool getTopLeft(int& top, int& left) {top = static_cast<int>(actY); left = static_cast<int>(actX); return true;};
virtual ~PlayGuiObject(){};
vector<Effect*> effects;
};