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

Some warning cleanup involving (seemlingly unintended) bool to int conversions. It seems that the original design intent was to pass down IDs to the base class JGuiObject, but certain classes broke the pattern with their constructors.

Browse Source 
(One could argue that this ID is completely meaningless and could be entirely ripped out, as the IDs obviously never made it to their intended target...)
This commit is contained in:
wrenczes@gmail.com
2011-06-02 05:33:45 +00:00
parent dcfbff6216
commit a06558be55
6 changed files with 207 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/mtg/src/PlayGuiObject.cpp
View File

@@ -4,8 +4,8 @@
using namespace std;
PlayGuiObject::PlayGuiObject(float desiredHeight, float x, float y, bool hasFocus) :
JGuiObject(0), Pos(x, y, 1.0, 0.0, 255)
PlayGuiObject::PlayGuiObject(float desiredHeight, float x, float y, int inID, bool hasFocus)
: JGuiObject(inID), Pos(x, y, 1.0, 0.0, 255)
{
defaultHeight = desiredHeight;
mHeight = desiredHeight;
@@ -13,8 +13,8 @@ PlayGuiObject::PlayGuiObject(float desiredHeight, float x, float y, bool hasFocu
type = 0;
wave = 0;
}
PlayGuiObject::PlayGuiObject(float desiredHeight, const Pos& ref, bool hasFocus) :
JGuiObject(0), Pos(ref)
PlayGuiObject::PlayGuiObject(float desiredHeight, const Pos& ref, int inID, bool hasFocus)
: JGuiObject(inID), Pos(ref)
{
defaultHeight = desiredHeight;
mHeight = desiredHeight;