From caec886e2276f4ec2ab811eb3be102bb6f5490c6 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Fri, 20 Dec 2013 00:24:08 +0100 Subject: [PATCH] Fixed issues found by XCode. --- JGE/include/JAnimator.h | 1 - JGE/include/JDistortionMesh.h | 1 - .../Default-568h@2x.png | Bin 0 -> 18594 bytes projects/mtg/include/GameStateAwards.h | 1 - projects/mtg/include/GuiPlay.h | 1 - projects/mtg/include/SimplePopup.h | 1 - projects/mtg/include/WResource_Fwd.h | 8 ++++---- projects/mtg/src/AllAbilities.cpp | 5 ----- projects/mtg/src/GuiPlay.cpp | 2 +- projects/mtg/src/MTGAbility.cpp | 2 -- projects/mtg/src/SimplePopup.cpp | 2 +- projects/mtg/wagic.pri | 10 +++++----- 12 files changed, 11 insertions(+), 23 deletions(-) create mode 100644 projects/build-wagic-qt-iphonesimulator_clang_Qt_5_2_0_for_iOS-Debug/Default-568h@2x.png diff --git a/JGE/include/JAnimator.h b/JGE/include/JAnimator.h index 794c6ce50..a525e3b88 100644 --- a/JGE/include/JAnimator.h +++ b/JGE/include/JAnimator.h @@ -297,7 +297,6 @@ public: private: float mTimer; float mFrameTime; - JAnimator* mAnimator; vector mObjects; }; diff --git a/JGE/include/JDistortionMesh.h b/JGE/include/JDistortionMesh.h index 10939a83e..171446a91 100644 --- a/JGE/include/JDistortionMesh.h +++ b/JGE/include/JDistortionMesh.h @@ -37,7 +37,6 @@ private: float mTexY; float mTexWidth; float mTexHeight; - JTexture* mTexture; JQuad* mQuad; diff --git a/projects/build-wagic-qt-iphonesimulator_clang_Qt_5_2_0_for_iOS-Debug/Default-568h@2x.png b/projects/build-wagic-qt-iphonesimulator_clang_Qt_5_2_0_for_iOS-Debug/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/projects/mtg/include/GameStateAwards.h b/projects/mtg/include/GameStateAwards.h index cb614895c..64cc741a6 100644 --- a/projects/mtg/include/GameStateAwards.h +++ b/projects/mtg/include/GameStateAwards.h @@ -17,7 +17,6 @@ private: WSrcCards * setSrc; SimpleMenu * menu; bool showMenu; - bool showAlt; bool saveMe; int mState; int mDetailItem; diff --git a/projects/mtg/include/GuiPlay.h b/projects/mtg/include/GuiPlay.h index 4eadc959a..c900b30ba 100644 --- a/projects/mtg/include/GuiPlay.h +++ b/projects/mtg/include/GuiPlay.h @@ -47,7 +47,6 @@ protected: { static const float HEIGHT; unsigned attackers; - unsigned blockers; unsigned currentAttacker; float height; diff --git a/projects/mtg/include/SimplePopup.h b/projects/mtg/include/SimplePopup.h index 154710e92..d61d7cc47 100644 --- a/projects/mtg/include/SimplePopup.h +++ b/projects/mtg/include/SimplePopup.h @@ -20,7 +20,6 @@ class SimplePopup: public JGuiController private: float mWidth, mX, mY; int mMaxLines; - int mFontId; DeckMetaData * mDeckInformation; string mTitle; WFont *mTextFont; diff --git a/projects/mtg/include/WResource_Fwd.h b/projects/mtg/include/WResource_Fwd.h index 139c08e01..c03b0b752 100644 --- a/projects/mtg/include/WResource_Fwd.h +++ b/projects/mtg/include/WResource_Fwd.h @@ -1,12 +1,12 @@ #ifndef WRESOURCE_FWD_H #define WRESOURCE_FWD_H -#ifndef WP8 -#include -typedef boost::shared_ptr JQuadPtr; -#else +#if (__cplusplus > 199711L) #include typedef std::shared_ptr JQuadPtr; +#else +#include +typedef boost::shared_ptr JQuadPtr; #endif #endif diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index adb9d2862..92fa9600e 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -1994,28 +1994,23 @@ int AADynamic::resolve() break; case DYNAMIC_ABILITY_WHO_ITSELF: source = ((MTGCardInstance *) _target); - _target = _target; break; case DYNAMIC_ABILITY_WHO_TARGETCONTROLLER: - _target = _target; secondaryTarget = ((MTGCardInstance *) _target)->controller(); break; case DYNAMIC_ABILITY_WHO_TARGETOPPONENT: - _target = _target; secondaryTarget = ((MTGCardInstance *) _target)->controller()->opponent(); break; case DYNAMIC_ABILITY_WHO_TOSOURCE: tosrc = true; break; case DYNAMIC_ABILITY_WHO_SOURCECONTROLLER: - _target = _target; secondaryTarget = ((MTGCardInstance *) OriginalSrc)->controller(); break; case DYNAMIC_ABILITY_WHO_SOURCEOPPONENT: secondaryTarget = OriginalSrc->controller()->opponent(); break; default: - _target = _target; break; } if(amountsource == DYNAMIC_MYSELF_AMOUNT) diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index 183bd581f..0ab99501d 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -103,7 +103,7 @@ inline float GuiPlay::VertStack::nextX() } GuiPlay::BattleField::BattleField() : - attackers(0), blockers(0), height(0.0), red(0), colorFlow(0) + attackers(0), height(0.0), red(0), colorFlow(0) { } const float GuiPlay::BattleField::HEIGHT = 80.0f; diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 4d9cd985c..ca1a4b5ab 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -4276,8 +4276,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell) if (card->hasType(Subtypes::TYPE_INSTANT) || card->hasType(Subtypes::TYPE_SORCERY)) { MTGPlayerCards * zones = card->owner->game; - if(card->getCurrentZone()) - card->currentZone->owner->game;//grab it from where ever it is. MTGPlayerCards * Endzones = card->owner->game;//put them in thier owners respective zones as per rules. if (card->basicAbilities[(int)Constants::EXILEDEATH]) { diff --git a/projects/mtg/src/SimplePopup.cpp b/projects/mtg/src/SimplePopup.cpp index b994d9c61..e8cccf5e4 100644 --- a/projects/mtg/src/SimplePopup.cpp +++ b/projects/mtg/src/SimplePopup.cpp @@ -15,7 +15,7 @@ #include SimplePopup::SimplePopup(int id, JGuiListener* listener, const int fontId, const char * _title, DeckMetaData* deckMetaData, MTGAllCards * collection, float cancelX, float cancelY) : - JGuiController(JGE::GetInstance(), id, listener), mFontId(fontId), mCollection(collection) + JGuiController(JGE::GetInstance(), id, listener), mCollection(collection) { mX = 19; mY = 66; diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index d797e9ebe..46ade1a36 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -4,11 +4,11 @@ TEMPLATE = app #!macx:CONFIG += precompile_header unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs -unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror +unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter +unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable +unix|*macx*:QMAKE_CXXFLAGS += -Wno-unused-value +unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs +unix:!*macx*:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror windows:DEFINES += _CRT_SECURE_NO_WARNINGS unix|macx:DEFINES += LINUX