diff --git a/Boost/boost/algorithm/string/detail/find_format_store.hpp b/Boost/boost/algorithm/string/detail/find_format_store.hpp index bac52e311..222dd5a41 100644 --- a/Boost/boost/algorithm/string/detail/find_format_store.hpp +++ b/Boost/boost/algorithm/string/detail/find_format_store.hpp @@ -71,7 +71,7 @@ namespace boost { }; template - bool check_find_result(InputT& Input, FindResultT& FindResult) + bool check_find_result(InputT&, FindResultT& FindResult) { typedef BOOST_STRING_TYPENAME range_const_iterator::type input_iterator_type; diff --git a/JGE/include/DebugRoutines.h b/JGE/include/DebugRoutines.h index 411247765..5fe025a07 100644 --- a/JGE/include/DebugRoutines.h +++ b/JGE/include/DebugRoutines.h @@ -33,7 +33,7 @@ std::string ToHex(T* pointer) { \ std::ostringstream stream; \ stream << inString << std::endl; \ - qDebug(stream.str().c_str()); \ + qDebug("%s", stream.str().c_str()); \ } #elif defined (ANDROID) #include diff --git a/JGE/include/JGui.h b/JGE/include/JGui.h index 3c1ebcbd3..2d263ded1 100644 --- a/JGE/include/JGui.h +++ b/JGE/include/JGui.h @@ -61,7 +61,7 @@ public: virtual bool ButtonPressed(); // action button pressed, return false to ignore // Used for mouse support so that the GUI engine can found out which Object was selected - virtual bool getTopLeft(float& top, float& left) + virtual bool getTopLeft(float&, float&) { return false; } diff --git a/JGE/include/qt/corewrapper.h b/JGE/include/qt/corewrapper.h index 250f58a8e..522b44ea6 100644 --- a/JGE/include/qt/corewrapper.h +++ b/JGE/include/qt/corewrapper.h @@ -73,7 +73,7 @@ public: Q_INVOKABLE qint64 getTick() { return g_startTimer.elapsed(); }; - Q_INVOKABLE void doScroll(int x, int y, int magnitude) { + Q_INVOKABLE void doScroll(int x, int y, int) { m_engine->Scroll(x, y); }; int getNominalHeight(){ return SCREEN_HEIGHT;}; diff --git a/JGE/src/JGE.cpp b/JGE/src/JGE.cpp index 096592912..eb606f302 100644 --- a/JGE/src/JGE.cpp +++ b/JGE/src/JGE.cpp @@ -591,6 +591,8 @@ void JGE::SendCommand(string command) sendJNICommand(command); #elif defined (IOS) SendCommand(command, ""); +#else + cerr << command; #endif } @@ -602,6 +604,8 @@ void JGE::SendCommand(std::string command, std::string parameter) [delegate handleWEngineCommand:[NSString stringWithCString: command.c_str() encoding: NSUTF8StringEncoding] withParameter: [NSString stringWithCString: parameter.c_str() encoding:NSUTF8StringEncoding]]; +#else + cerr << command << " " << parameter; #endif } @@ -613,6 +617,8 @@ void JGE::SendCommand(std::string command, float& x, float& y, float& width, flo #elif IOS wagicAppDelegate *delegate = [[UIApplication sharedApplication] delegate]; [delegate handleWEngineCommand: [NSString stringWithCString: command.c_str() encoding: NSUTF8StringEncoding] withUIParameters: x yCoordinate: y width: width height: height]; +#else + cerr << command << " " << x << " " << y << " " << width << " " << height; #endif } @@ -656,7 +662,6 @@ JNIEnv * JGE::getJNIEnv() string JGE::getFileSystemLocation() { - char result[512]; JNIEnv * env = getJNIEnv(); if (env == NULL) { diff --git a/JGE/src/JMD2Model.cpp b/JGE/src/JMD2Model.cpp index 176f12a79..4dc464d38 100644 --- a/JGE/src/JMD2Model.cpp +++ b/JGE/src/JMD2Model.cpp @@ -257,6 +257,8 @@ void JMD2Model::CalculateNormal(float *p1, float *p2, float *p3) #else // FIXME #endif +#else + cerr << p1 << " " << p2 << " " << p3 << endl; #endif } diff --git a/JGE/src/JNetwork.cpp b/JGE/src/JNetwork.cpp index ade067a5b..769764a52 100644 --- a/JGE/src/JNetwork.cpp +++ b/JGE/src/JNetwork.cpp @@ -62,6 +62,8 @@ void JNetwork::getServerIp(string& aString) memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr)); aString = inet_ntoa(addr); } +#else + aString = "No clue"; #endif } diff --git a/JGE/src/Qtmain.cpp b/JGE/src/Qtmain.cpp index 72f808a09..bbdff7f8f 100644 --- a/JGE/src/Qtmain.cpp +++ b/JGE/src/Qtmain.cpp @@ -1,7 +1,7 @@ #define GL_GLEXT_PROTOTYPES #include #include -#include +#include #include #ifdef QT_WIDGET #include diff --git a/JGE/src/pc/JGfx.cpp b/JGE/src/pc/JGfx.cpp index 331432f54..190e1f530 100644 --- a/JGE/src/pc/JGfx.cpp +++ b/JGE/src/pc/JGfx.cpp @@ -1584,7 +1584,7 @@ void JRenderer::Plot(float x, float y, PIXEL_TYPE color) glEnd(); glColor4ub(255, 255, 255, 255); #else - // FIXME, not used + cerr << x << " " << y << " " << color << endl; #endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0) glEnable(GL_TEXTURE_2D); checkGlError(); @@ -1606,6 +1606,7 @@ void JRenderer::PlotArray(float *x, float *y, int count, PIXEL_TYPE color) glColor4ub(255, 255, 255, 255); #else // FIXME, not used + cerr << x << " " << y << " " << count << " " << " " << color << endl; #endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0) glEnable(GL_TEXTURE_2D); checkGlError(); @@ -2242,7 +2243,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm return tex; } #elif (defined QT_CONFIG) -JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureFormat __attribute__((unused))) +JTexture* JRenderer::LoadTexture(const char* filename, int, int) { JTexture *tex = NULL; int rawsize = 0; @@ -2518,7 +2519,7 @@ void JRenderer::Enable3D() } -void JRenderer::SetClip(int x, int y, int width, int height) +void JRenderer::SetClip(int, int, int, int) {// NOT USED //glScissor(x, y, width, height); } @@ -2530,25 +2531,25 @@ void JRenderer::LoadIdentity() } -void JRenderer::Translate(float x, float y, float z) +void JRenderer::Translate(float, float, float) {// NOT USED //glTranslatef(x, y, z); } -void JRenderer::RotateX(float angle) +void JRenderer::RotateX(float) {// NOT USED //glRotatef(angle*RAD2DEG, 1.0f, 0.0f, 0.0f); } -void JRenderer::RotateY(float angle) +void JRenderer::RotateY(float) {// NOT USED //glRotatef(angle*RAD2DEG, 0.0f, 1.0f, 0.0f); } -void JRenderer::RotateZ(float angle) +void JRenderer::RotateZ(float) {// NOT USED //glRotatef(angle*RAD2DEG, 0.0f, 0.0f, 1.0f); } diff --git a/JGE/src/pc/JSfx.cpp b/JGE/src/pc/JSfx.cpp index 243811d26..4977bc831 100644 --- a/JGE/src/pc/JSfx.cpp +++ b/JGE/src/pc/JSfx.cpp @@ -174,6 +174,7 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName) } return music; #else + cerr << fileName << endl; return NULL; #endif } @@ -203,6 +204,9 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping) else FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF); } +#else + music = 0; + looping = false; #endif } @@ -216,6 +220,8 @@ void JSoundSystem::StopMusic(JMusic *music) } #elif (defined WITH_FMOD) FSOUND_StopSound(mChannel); +#else + music = 0; #endif } @@ -290,6 +296,7 @@ JSample *JSoundSystem::LoadSample(const char *fileName) } return sample; #else + cerr << fileName << endl; return NULL; #endif } @@ -308,6 +315,8 @@ void JSoundSystem::PlaySample(JSample *sample) int channel = FSOUND_PlaySound(FSOUND_FREE, sample->mSample); FSOUND_SetVolumeAbsolute(channel, static_cast(mSampleVolume * 2.55)); } +#else + sample = 0; #endif } diff --git a/JGE/src/qt/corewrapper.cpp b/JGE/src/qt/corewrapper.cpp index d6c6503b1..8e862ad86 100644 --- a/JGE/src/qt/corewrapper.cpp +++ b/JGE/src/qt/corewrapper.cpp @@ -467,12 +467,12 @@ void WagicCore::mouseMoveEvent(QMouseEvent *event) } } -void WagicCore::showEvent ( QShowEvent * event ) +void WagicCore::showEvent ( QShowEvent * ) { setActive(true); } -void WagicCore::hideEvent ( QHideEvent * event ) +void WagicCore::hideEvent ( QHideEvent * ) { setActive(false); } diff --git a/JGE/src/zipFS/zstream.cpp b/JGE/src/zipFS/zstream.cpp index 5fe924730..51ed0557e 100644 --- a/JGE/src/zipFS/zstream.cpp +++ b/JGE/src/zipFS/zstream.cpp @@ -134,7 +134,7 @@ zbuffer_stored * zbuffer_stored::close() -int zbuffer_stored::overflow(int c) +int zbuffer_stored::overflow(int) { return EOF; } @@ -231,7 +231,7 @@ int zbuffer_stored::sync() -streambuf * zbuffer_stored::setbuf(char * pr, int nLength) +streambuf * zbuffer_stored::setbuf(char *, int) { return NULL; } @@ -298,7 +298,7 @@ zbuffer_deflated * zbuffer_deflated::close() -int zbuffer_deflated::overflow(int c) +int zbuffer_deflated::overflow(int) { return EOF; } @@ -442,7 +442,7 @@ int zbuffer_deflated::sync() -streambuf * zbuffer_deflated::setbuf(char * pr, int nLength) +streambuf * zbuffer_deflated::setbuf(char *, int) { return NULL; } diff --git a/projects/mtg/include/ActionElement.h b/projects/mtg/include/ActionElement.h index b027e2d8f..7be2a33b8 100644 --- a/projects/mtg/include/ActionElement.h +++ b/projects/mtg/include/ActionElement.h @@ -30,7 +30,7 @@ public: int modal; int waitingForAnswer; int getActivity(); - virtual void Update(float dt){}; + virtual void Update(float){}; virtual void Render(){}; virtual int testDestroy() { @@ -42,7 +42,7 @@ public: return 0; } ; - virtual bool CheckUserInput(JButton key) + virtual bool CheckUserInput(JButton) { return false; } @@ -54,26 +54,26 @@ public: virtual ~ActionElement(); virtual int isReactingToTargetClick(Targetable * card); virtual int reactToTargetClick(Targetable * card); - virtual int reactToChoiceClick(Targetable * card,int choice = 0,int controlid = 0) + virtual int reactToChoiceClick(Targetable *,int,int) { return 0; } - virtual int isReactingToClick(MTGCardInstance * card, ManaCost * man = NULL) + virtual int isReactingToClick(MTGCardInstance *, ManaCost * = NULL) { return 0; } ; - virtual int stillInUse(MTGCardInstance * card) + virtual int stillInUse(MTGCardInstance *) { return 0; } ; - virtual int receiveEvent(WEvent * event) + virtual int receiveEvent(WEvent *) { return 0; } ; - virtual int reactToClick(MTGCardInstance * card) + virtual int reactToClick(MTGCardInstance *) { return 0; } diff --git a/projects/mtg/include/ActionStack.h b/projects/mtg/include/ActionStack.h index 01aa3f394..0e7e52cf2 100644 --- a/projects/mtg/include/ActionStack.h +++ b/projects/mtg/include/ActionStack.h @@ -58,7 +58,7 @@ public: mHasFocus = true; } - virtual bool Leaving(JButton key) + virtual bool Leaving(JButton) { mHasFocus = false; return true; @@ -86,7 +86,7 @@ public: virtual const string getDisplayName() const; void Render(MTGCardInstance * source, JQuad * targetQuad, string alt1, string alt2, string action, bool bigQuad = false); - virtual int receiveEvent(WEvent * event) + virtual int receiveEvent(WEvent *) { return 0; } diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 751dfaba4..044d19b96 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -289,8 +289,10 @@ private: if(toughnessCheck) check = cCard->toughness; - check > highest?highest = check:highest = highest; - check <= lowest?lowest = check:lowest = lowest; + if(check > highest) + highest = check; + if(check <= lowest) + lowest = check; } } } @@ -1044,6 +1046,7 @@ public: ~ATutorialMessage(); //JGuiListener Implementation + using JGuiObject::ButtonPressed; void ButtonPressed(int controllerId, int controlId); }; @@ -1660,7 +1663,7 @@ public: abilitygranted = _ability; } - int isReactingToClick(MTGCardInstance * card, ManaCost * cost = NULL) + int isReactingToClick(MTGCardInstance *, ManaCost *) { //The upper level "GenericTargetAbility" takes care of the click so we always return 0 here return 0; @@ -1718,7 +1721,7 @@ public: trigger.setColor(color); } - int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * _card, ManaCost * = NULL) { if (_card == source && game->currentlyActing()->game->inPlay->hasCard(source)) { @@ -1778,7 +1781,7 @@ public: { } - int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * _card, ManaCost * = NULL) { if (_card == target && game->currentlyActing()->game->inPlay->hasCard(source) && _card->isTapped()) { @@ -1989,7 +1992,7 @@ public: aType = MTGAbility::STANDARD_PUMP; } - void Update(float dt) + void Update(float) { if(!nonstatic) return; @@ -2290,7 +2293,7 @@ public: { } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase && newPhase == phase && game->currentPlayer == ((MTGCardInstance *) target)->controller()) { @@ -2450,15 +2453,15 @@ public: return 1; } /////////////////section required///////////////////// - int added(MTGCardInstance * card) + int added(MTGCardInstance *) { return 1; } - int added(Player * p) + int added(Player *) { return 1; } - int removed(MTGCardInstance * card) + int removed(MTGCardInstance *) { return 1; } @@ -2618,7 +2621,7 @@ public: int includeSelf; map skills; - ATeach(GameObserver* observer, int _id, MTGCardInstance * card, TargetChooser * _tc, int _includeSelf, MTGAbility * a) : + ATeach(GameObserver* observer, int _id, MTGCardInstance * card, TargetChooser * _tc, int, MTGAbility * a) : ListMaintainerAbility(observer, _id, card), NestedAbility(a) { tc = _tc; @@ -2896,7 +2899,7 @@ public: MTGCardInstance * myToken; vector currentAbilities; Player * tokenReciever; - ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost, int tokenId,string starfound, WParsedInt * multiplier = NULL, + ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, int tokenId,string starfound, WParsedInt * multiplier = NULL, int who = 0,bool aLivingWeapon = false) : ActivatedAbility(observer, _id, _source, _cost, 0), tokenId(tokenId), starfound(starfound),multiplier(multiplier), who(who),aLivingWeapon(aLivingWeapon) { @@ -2906,14 +2909,13 @@ public: battleReady = false; } - ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost, string sname, string stypes, int _power, int _toughness, - string sabilities, string starfound,WParsedInt * multiplier = NULL, int who = 0,bool aLivingWeapon = false,string spt = "") : - ActivatedAbility(observer, _id, _source, _cost, 0),sabilities(sabilities),starfound(starfound), multiplier(multiplier), who(who),aLivingWeapon(aLivingWeapon),spt(spt) + ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, string sname, string stypes, int _power, int _toughness, + string sabilities, string starfound,WParsedInt * multiplier = NULL, int _who = 0,bool aLivingWeapon = false,string spt = "") : + ActivatedAbility(observer, _id, _source, _cost, 0),sabilities(sabilities),starfound(starfound), multiplier(multiplier), who(_who),aLivingWeapon(aLivingWeapon),spt(spt) { power = _power; toughness = _toughness; name = sname; - who = who; tokenId = 0; aType = MTGAbility::STANDARD_TOKENCREATOR; battleReady = false; @@ -3136,7 +3138,7 @@ public: int who; MTGCardInstance * myDummy; Player * abilityReciever; - ATargetedAbilityCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost,string _name, string abilityToAdd, int who = 0) : + ATargetedAbilityCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost,string _name, string abilityToAdd, int who = 0) : ActivatedAbility(observer, _id, _source, _cost, 0),name(_name),sabilities(abilityToAdd), who(who) { } @@ -3242,7 +3244,7 @@ public: return MTGAbility::addToGame(); } - void Update(float dt) + void Update(float) { resolve(); } @@ -3432,7 +3434,7 @@ public: return MTGAbility::addToGame(); } - void Update(float dt) + void Update(float) { resolve(); } @@ -3518,7 +3520,7 @@ public: return MTGAbility::addToGame(); } - void Update(float dt) + void Update(float) { resolve(); } @@ -3930,7 +3932,7 @@ public: } } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase && newPhase == phase) { @@ -3977,7 +3979,7 @@ public: sprintf(land, "%s", _land); } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase && (newPhase == MTG_PHASE_COMBATBEGIN || newPhase == MTG_PHASE_COMBATATTACKERS)) { @@ -4512,7 +4514,8 @@ public: } } - void Render(float dt) + using TargetAbility::Render; + void Render(float) { if (waitingForAnswer) { @@ -4565,7 +4568,7 @@ public: cost = ManaCost(_cost, 1); } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase) { @@ -4582,7 +4585,7 @@ public: } } } - int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * _card, ManaCost * = NULL) { if (counters > 0 && _card == source && currentPhase == MTG_PHASE_UPKEEP) { @@ -4673,12 +4676,12 @@ public: return 1; } - void Update(float dt) + void Update(float) { alterDamage(); } - int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * _card, ManaCost * = NULL) { if (_card == source && game->currentlyActing()->game->inPlay->hasCard(source) && !_card->isTapped()) { @@ -4723,7 +4726,7 @@ public: nbOpponents = 0; } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase) { @@ -4823,7 +4826,7 @@ public: attackedThisTurn = 1; } - void Update(float dt) + void Update(float) { if (newPhase != currentPhase) { @@ -4990,7 +4993,7 @@ public: TriggeredAbility::Update(dt); } - int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * card, ManaCost * = NULL) { MTGCardInstance * _target = (MTGCardInstance *) target; if (damagesToDealThisTurn && currentPhase == MTG_PHASE_UPKEEP && card == source && _target->controller() @@ -5001,7 +5004,7 @@ public: return 0; } - int reactToclick(MTGCardInstance * card) + int reactToclick(MTGCardInstance *) { game->currentPlayer->getManaPool()->pay(&cost); damagesToDealThisTurn--; @@ -5136,7 +5139,7 @@ public: initThisTurn = 0; } - void Update(float dt) + void Update(float) { if (currentPhase == MTG_PHASE_UNTAP && game->currentPlayer == source->controller()) { @@ -5160,7 +5163,7 @@ public: } } - int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL) + int isReactingToClick(MTGCardInstance * card, ManaCost * = NULL) { if (card == source && game->currentPlayer == card->controller()) { diff --git a/projects/mtg/include/DamagerDamaged.h b/projects/mtg/include/DamagerDamaged.h index 8547e995f..cb0f42d31 100644 --- a/projects/mtg/include/DamagerDamaged.h +++ b/projects/mtg/include/DamagerDamaged.h @@ -23,6 +23,7 @@ struct DamagerDamaged: TransientCardView DamagerDamaged(MTGCardInstance* card, const Pos& ref, bool show, Player* damageSelecter); ~DamagerDamaged(); + using CardGui::Render; void Render(CombatStep mode); }; diff --git a/projects/mtg/include/DeckMenu.h b/projects/mtg/include/DeckMenu.h index 8757609d6..0f2376634 100644 --- a/projects/mtg/include/DeckMenu.h +++ b/projects/mtg/include/DeckMenu.h @@ -78,6 +78,7 @@ public: virtual void Render(); virtual void Update(float dt); + using JGuiController::Add; virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false, DeckMetaData *deckMetaData = NULL); virtual void Close(); void updateScroller(); diff --git a/projects/mtg/include/GameObserver.h b/projects/mtg/include/GameObserver.h index 03c89be8e..281e742ba 100644 --- a/projects/mtg/include/GameObserver.h +++ b/projects/mtg/include/GameObserver.h @@ -204,7 +204,7 @@ public: static void sendAction(void*pThis, stringstream& in, stringstream& out); static void synchronize(void*pThis, stringstream& in, stringstream& out); static void checkSynchro(void*pxThis, stringstream& in, stringstream& out); - static void ignoreResponse(void*pThis, stringstream& in, stringstream& out){}; + static void ignoreResponse(void*, stringstream&, stringstream&){}; static void disconnect(void*pxThis, stringstream& in, stringstream& out); }; #endif diff --git a/projects/mtg/include/GameState.h b/projects/mtg/include/GameState.h index e080109ea..93ef9ff75 100644 --- a/projects/mtg/include/GameState.h +++ b/projects/mtg/include/GameState.h @@ -56,7 +56,7 @@ public: virtual void Start(){} virtual void End(){} - virtual void OnScroll(int inXVelocity, int inYVelocity) + virtual void OnScroll(int, int) { } diff --git a/projects/mtg/include/GuiLayers.h b/projects/mtg/include/GuiLayers.h index 4df7b41bc..8dfc61352 100644 --- a/projects/mtg/include/GuiLayers.h +++ b/projects/mtg/include/GuiLayers.h @@ -33,7 +33,7 @@ public: GuiLayer(DuelLayers *duelLayers); virtual ~GuiLayer(); virtual void Update(float dt); - virtual bool CheckUserInput(JButton key) + virtual bool CheckUserInput(JButton) { return false; } @@ -48,12 +48,12 @@ public: return 1; } - virtual int receiveEventPlus(WEvent * e) + virtual int receiveEventPlus(WEvent *) { return 0; } - virtual int receiveEventMinus(WEvent * e) + virtual int receiveEventMinus(WEvent *) { return 0; } diff --git a/projects/mtg/include/GuiMana.h b/projects/mtg/include/GuiMana.h index 01cf5edc6..289422175 100644 --- a/projects/mtg/include/GuiMana.h +++ b/projects/mtg/include/GuiMana.h @@ -28,6 +28,7 @@ public: int color; void Render(); + using Pos::Update; void Update(float dt, float shift); void Wither(); void Drop(); diff --git a/projects/mtg/include/MTGAbility.h b/projects/mtg/include/MTGAbility.h index fdd321af7..018b602bf 100644 --- a/projects/mtg/include/MTGAbility.h +++ b/projects/mtg/include/MTGAbility.h @@ -144,22 +144,22 @@ public: { } - virtual int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL) + virtual int isReactingToClick(MTGCardInstance *, ManaCost *) { return 0; } - virtual int reactToClick(MTGCardInstance * card) + virtual int reactToClick(MTGCardInstance *) { return 0; } - virtual int receiveEvent(WEvent * event) + virtual int receiveEvent(WEvent *) { return 0; } - virtual void Update(float dt) + virtual void Update(float) { } @@ -239,7 +239,7 @@ public: return 0; } - virtual int triggerOnEvent(WEvent * e) + virtual int triggerOnEvent(WEvent *) { return 0; } @@ -369,17 +369,17 @@ public: virtual int added(MTGCardInstance * card) = 0; virtual int removed(MTGCardInstance * card) = 0; - virtual int canBeInList(Player * p) + virtual int canBeInList(Player *) { return 0; } - virtual int added(Player * p) + virtual int added(Player *) { return 0; } - virtual int removed(Player * p) + virtual int removed(Player *) { return 0; } diff --git a/projects/mtg/include/MTGPack.h b/projects/mtg/include/MTGPack.h index 2b826981e..84db2c957 100644 --- a/projects/mtg/include/MTGPack.h +++ b/projects/mtg/include/MTGPack.h @@ -42,7 +42,7 @@ public: class MTGPackEntryNothing: public MTGPackEntry { public: - int addCard(WSrcCards * pool, MTGDeck * to) + int addCard(WSrcCards *, MTGDeck *) { return 0; } diff --git a/projects/mtg/include/PlayGuiObject.h b/projects/mtg/include/PlayGuiObject.h index f42011897..5855c2884 100644 --- a/projects/mtg/include/PlayGuiObject.h +++ b/projects/mtg/include/PlayGuiObject.h @@ -32,14 +32,14 @@ public: zoom = 1.4f; } ; - virtual bool Leaving(JButton key) + virtual bool Leaving(JButton) { mHasFocus = false; zoom = 1.0; return true; } ; - virtual bool CheckUserInput(JButton key) + virtual bool CheckUserInput(JButton) { return false; } @@ -56,7 +56,7 @@ public: PlayGuiObject(float desiredHeight, const Pos& ref, int inID, bool hasFocus); - virtual void ButtonPressed(int controllerId, int controlId) {} + virtual void ButtonPressed(int, int) {} virtual bool getTopLeft(float& top, float& left) { top = actY; diff --git a/projects/mtg/include/Player.h b/projects/mtg/include/Player.h index 1f93a7ef7..099b24604 100644 --- a/projects/mtg/include/Player.h +++ b/projects/mtg/include/Player.h @@ -71,7 +71,7 @@ public: ManaCost * doesntEmpty; ManaCost * poolDoesntEmpty; void cleanupPhase(); - virtual int Act(float dt) + virtual int Act(float) { return 0; } @@ -90,7 +90,7 @@ public: int getId(); JQuadPtr getIcon(); - virtual int receiveEvent(WEvent * event) + virtual int receiveEvent(WEvent *) { return 0; } diff --git a/projects/mtg/include/SimpleMenu.h b/projects/mtg/include/SimpleMenu.h index ac02397bc..572daba3c 100644 --- a/projects/mtg/include/SimpleMenu.h +++ b/projects/mtg/include/SimpleMenu.h @@ -42,6 +42,7 @@ public: virtual void Render(); virtual bool CheckUserInput(JButton key); virtual void Update(float dt); + using JGuiController::Add; virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false); int getmCurr(){return mCurr;} float getWidth(){return mWidth; } diff --git a/projects/mtg/include/StoryFlow.h b/projects/mtg/include/StoryFlow.h index 8e8dc0e47..d99a8e62f 100644 --- a/projects/mtg/include/StoryFlow.h +++ b/projects/mtg/include/StoryFlow.h @@ -21,7 +21,7 @@ public: { } ; - bool Leaving(JButton key) + bool Leaving(JButton) { return false; } diff --git a/projects/mtg/include/TargetChooser.h b/projects/mtg/include/TargetChooser.h index 184eea35f..6949be306 100644 --- a/projects/mtg/include/TargetChooser.h +++ b/projects/mtg/include/TargetChooser.h @@ -53,11 +53,11 @@ public: { return 0; } - virtual bool targetsZone(MTGGameZone * z) + virtual bool targetsZone(MTGGameZone *) { return false; } - virtual bool targetsZone(MTGGameZone * z,MTGCardInstance * mSource) + virtual bool targetsZone(MTGGameZone *,MTGCardInstance *) { return false; } diff --git a/projects/mtg/include/WDataSrc.h b/projects/mtg/include/WDataSrc.h index b18f4a438..7279f78c7 100644 --- a/projects/mtg/include/WDataSrc.h +++ b/projects/mtg/include/WDataSrc.h @@ -15,7 +15,7 @@ class JQuad; class WSyncable { public: - WSyncable(int i = 0) + WSyncable() { hooked = NULL; currentPos = 0; @@ -54,32 +54,32 @@ public: { } - virtual JQuadPtr getImage(int offset = 0) + virtual JQuadPtr getImage(int = 0) { return JQuadPtr(); } - virtual JQuadPtr getThumb(int offset = 0) + virtual JQuadPtr getThumb(int = 0) { return JQuadPtr(); } - virtual MTGCard * getCard(int offset = 0, bool ignore = false) + virtual MTGCard * getCard(int = 0, bool = false) { return NULL; } - virtual MTGDeck * getDeck(int offset = 0) + virtual MTGDeck * getDeck(int = 0) { return NULL; } - virtual WDistort * getDistort(int offset = 0) + virtual WDistort * getDistort(int = 0) { return NULL; } - virtual bool thisCard(int mtgid) + virtual bool thisCard(int) { return false; } @@ -160,7 +160,7 @@ public: virtual void updateCounts() {}; virtual void clearCounts() {}; - virtual void addCount(MTGCard * c, int qty = 1) {}; + virtual void addCount(MTGCard *, int = 1) {}; //Loads into us. Calls validate() virtual int loadMatches(MTGAllCards* ac); //loadMatches adds the cards from something @@ -208,7 +208,7 @@ public: return active->getCard(offset, ignore); } - int Size(bool all = false) + int Size(bool = false) { return active->Size(); } diff --git a/projects/mtg/include/WEvent.h b/projects/mtg/include/WEvent.h index 99695069f..0430190ad 100644 --- a/projects/mtg/include/WEvent.h +++ b/projects/mtg/include/WEvent.h @@ -34,7 +34,7 @@ public: virtual ~WEvent() {}; virtual std::ostream& toString(std::ostream& out) const; virtual int getValue() {return 0;}; - virtual Targetable * getTarget(int target) {return 0;}; + virtual Targetable * getTarget(int) {return 0;}; }; struct WEventZoneChange : public WEvent { @@ -64,6 +64,7 @@ struct WEventCounters : public WEvent { bool added; bool removed; WEventCounters(Counters *counter,string name,int power, int toughness,bool added = false, bool removed = false); + using WEvent::getTarget; virtual Targetable * getTarget(); }; @@ -221,7 +222,8 @@ struct WEventcardDraw : public WEvent { WEventcardDraw(Player * player,int nb_cards); Player * player; int nb_cards; - virtual Targetable * getTarget(Player * player); + using WEvent::getTarget; + virtual Targetable * getTarget(Player * player); }; //event for a card draw ability resolving struct WEventDraw : public WEvent { diff --git a/projects/mtg/include/WFilter.h b/projects/mtg/include/WFilter.h index 560499ce7..2ec34538a 100644 --- a/projects/mtg/include/WFilter.h +++ b/projects/mtg/include/WFilter.h @@ -42,7 +42,7 @@ public: /** Returns true if the card argument matches a certain condition. */ - virtual bool isMatch(MTGCard * c) + virtual bool isMatch(MTGCard *) { return true; } @@ -211,7 +211,7 @@ public: return "NULL"; } ; - bool isMatch(MTGCard *c) + bool isMatch(MTGCard *) { return true; } diff --git a/projects/mtg/include/WFont.h b/projects/mtg/include/WFont.h index c9cfd3ef6..ee7d9d680 100644 --- a/projects/mtg/include/WFont.h +++ b/projects/mtg/include/WFont.h @@ -141,9 +141,9 @@ public: float GetScale() const; float GetHeight() const; virtual float GetStringWidth(const char *s) const; - void SetTracking(float tracking) {}; - void SetBase(int base) {}; - void FormatText(string &s, vector& output) {}; + void SetTracking(float) {}; + void SetBase(int) {}; + void FormatText(string &, vector&) {}; virtual void DrawString(const char *s, float x, float y, int align = JGETEXT_LEFT, float leftOffset = 0, float width = 0); virtual int GetCode(const u8 *ch, int *charLength) const = 0; diff --git a/projects/mtg/include/WGui.h b/projects/mtg/include/WGui.h index 2c46239c9..60dab9a7b 100644 --- a/projects/mtg/include/WGui.h +++ b/projects/mtg/include/WGui.h @@ -108,7 +108,7 @@ public: Note: This is ONLY called after the user presses "OK" on a WDecoConfirm dialog. See setData() for the standard method of changing underlying data. */ - virtual void confirmChange(bool confirmed) {}; + virtual void confirmChange(bool) {}; /** Returns whether or not any changes to this item would require confirmation. Can also be used to validate those changes, or to perform necessary cleanup when a change fails. @@ -116,7 +116,7 @@ public: virtual CONFIRM_TYPE needsConfirm(); virtual bool yieldFocus(); virtual PIXEL_TYPE getColor(int type); - virtual float getMargin(int type) + virtual float getMargin(int) { return 4; } @@ -147,7 +147,7 @@ public: */ virtual void setData()=0; - virtual void ButtonPressed(int controllerId, int controlId) {}; + virtual void ButtonPressed(int, int) {}; /** Used when it is necessary to update some information. Often called from confirmChange(), but also called in other places, such as to reload the list of possible profiles after a new one is created. See OptionProfile @@ -198,19 +198,19 @@ public: ; /** Sets the modality of the item, if applicable. */ - virtual void setModal(bool val) {}; - virtual void setDisplay(string s) {}; - virtual void setX(float _x) {}; - virtual void setY(float _y) {}; - virtual void setWidth(float _w) {}; - virtual void setHeight(float _h) {}; - virtual void setId(int _id) {}; - virtual void setHidden(bool bHidden){}; - virtual void setVisible(bool bVisisble) {}; + virtual void setModal(bool) {}; + virtual void setDisplay(string) {}; + virtual void setX(float) {}; + virtual void setY(float) {}; + virtual void setWidth(float) {}; + virtual void setHeight(float) {}; + virtual void setId(int) {}; + virtual void setHidden(bool){}; + virtual void setVisible(bool) {}; virtual void renderBack(WGuiBase * it); - virtual void subBack(WGuiBase * item) {}; + virtual void subBack(WGuiBase *) {}; - virtual bool CheckUserInput(JButton key) + virtual bool CheckUserInput(JButton) { return false; } @@ -228,7 +228,7 @@ public: virtual void Entering(JButton key); virtual bool Leaving(JButton key); virtual bool CheckUserInput(JButton key); - virtual void Update(float dt) {}; + virtual void Update(float) {}; virtual void Render(); WGuiItem(string _display, u8 _mF = 0); @@ -287,7 +287,7 @@ public: ; virtual float minWidth(); virtual float minHeight(); - virtual void setId(int _id) {}; + virtual void setId(int) {}; virtual void setX(float _x) { x = _x; diff --git a/projects/mtg/qml/qmlapplicationviewer/qmlapplicationviewer.cpp b/projects/mtg/qml/qmlapplicationviewer/qmlapplicationviewer.cpp index e05e91026..b61d6a7a6 100644 --- a/projects/mtg/qml/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/projects/mtg/qml/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -114,7 +114,7 @@ void QmlApplicationViewer::addImportPath(const QString &path) engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path)); } -void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) +void QmlApplicationViewer::setOrientation(ScreenOrientation) { #if defined(Q_OS_SYMBIAN) // If the version of Qt on the device is < 4.7.2, that attribute won't work @@ -126,7 +126,7 @@ void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) } } #endif // Q_OS_SYMBIAN - +/* Qt::WidgetAttribute attribute; switch (orientation) { #if QT_VERSION < 0x040702 @@ -152,9 +152,10 @@ void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) case ScreenOrientationAuto: attribute = Qt::WA_AutoOrientation; break; + #endif // QT_VERSION < 0x040702 }; - setAttribute(attribute, true); + setAttribute(attribute, true);*/ } void QmlApplicationViewer::showExpanded() diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 931f443c8..1c911af9d 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -138,7 +138,7 @@ AIPlayer::~AIPlayer() } -int AIPlayer::Act(float dt) +int AIPlayer::Act(float) { if (observer->currentPlayer == this) observer->userRequestNextGamePhase(); @@ -183,7 +183,7 @@ int AIPlayer::clickMultiTarget(TargetChooser * tc, vector& potentia return 1; } -int AIPlayer::clickSingleTarget(TargetChooser * tc, vector& potentialTargets, MTGCardInstance * chosenCard) +int AIPlayer::clickSingleTarget(TargetChooser *, vector& potentialTargets, MTGCardInstance * chosenCard) { int i = randomGenerator.random() % potentialTargets.size(); @@ -248,7 +248,7 @@ AIPlayer * AIPlayerFactory::createAIPlayer(GameObserver *observer, MTGAllCards * return baka; } -int AIPlayer::receiveEvent(WEvent * event) +int AIPlayer::receiveEvent(WEvent *) { return 0; } diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp index 87d9a1c30..a10e438f0 100644 --- a/projects/mtg/src/AIPlayerBaka.cpp +++ b/projects/mtg/src/AIPlayerBaka.cpp @@ -645,7 +645,7 @@ int AIPlayerBaka::getEfficiency(OrderedAIAction * action) // -MTGCardInstance * AIPlayerBaka::chooseCard(TargetChooser * tc, MTGCardInstance * source, int random) +MTGCardInstance * AIPlayerBaka::chooseCard(TargetChooser * tc, MTGCardInstance * source, int) { MTGPlayerCards * playerZones = source->controller()->game; if (comboHint && comboHint->cardTargets.size()) diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index 3efc2106a..aea0ea294 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -456,7 +456,7 @@ void ActionLayer::doReactTo(int menuIndex) } } -void ActionLayer::ButtonPressed(int controllerid, int controlid) +void ActionLayer::ButtonPressed(int, int controlid) { stringstream stream; for(size_t i = 0; i < abilitiesMenu->mObjects.size(); i++) diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index da172a8aa..82d6266cb 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -308,7 +308,6 @@ int Spell::resolve() { Player * p = source->controller(); int castMethod = source->castMethod; - Player * playerT = source->playerTarget; vectorbackupTgt = source->backupTargets; source = p->game->putInZone(source, from, p->game->battlefield); diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 9e4c456c4..d1b62db9a 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -544,7 +544,7 @@ AACounter * AACounter::clone() const } //shield a card from a certain type of counter. -ACounterShroud::ACounterShroud(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target,TargetChooser * tc, Counter * counter) : +ACounterShroud::ACounterShroud(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance *,TargetChooser * tc, Counter * counter) : MTGAbility(observer, id, source),csTc(tc),counter(counter),re(NULL) { } @@ -732,7 +732,7 @@ AARemoveAllCounter * AARemoveAllCounter::clone() const } //proliferate a target -AAProliferate::AAProliferate(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,ManaCost * cost) : +AAProliferate::AAProliferate(GameObserver* observer, int id, MTGCardInstance * source, Targetable *,ManaCost * cost) : ActivatedAbility(observer, id, source, cost, 0) { this->GetId(); @@ -789,7 +789,7 @@ AAProliferate::~AAProliferate() } // //choosing a type or color -GenericChooseTypeColor::GenericChooseTypeColor(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _toAdd,bool chooseColor,bool nonwall, ManaCost * cost) : +GenericChooseTypeColor::GenericChooseTypeColor(GameObserver* observer, int id, MTGCardInstance * source, Targetable *,string _toAdd,bool chooseColor,bool nonwall, ManaCost * cost) : ActivatedAbility(observer, id, source, cost, 0), baseAbility(_toAdd),chooseColor(chooseColor),ANonWall(nonwall) { this->GetId(); @@ -973,8 +973,8 @@ AASetTypeChosen::~AASetTypeChosen() // //choosing a type or color -GenericFlipACoin::GenericFlipACoin(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _toAdd, ManaCost * cost) : -ActivatedAbility(observer, id, source, cost, 0), baseAbility(_toAdd),chooseColor(chooseColor) +GenericFlipACoin::GenericFlipACoin(GameObserver* observer, int id, MTGCardInstance * source, Targetable *,string _toAdd, ManaCost * cost) : +ActivatedAbility(observer, id, source, cost, 0), baseAbility(_toAdd),chooseColor(true) { this->GetId(); setCoin = NULL; @@ -1881,28 +1881,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) @@ -2112,7 +2107,7 @@ int AADynamic::resolve() return 0; } -int AADynamic::activateMainAbility(MTGAbility * toActivate,MTGCardInstance * source , Damageable * target) +int AADynamic::activateMainAbility(MTGAbility * toActivate,MTGCardInstance * , Damageable *) { if(storedAbility) activateStored(); @@ -2867,7 +2862,6 @@ int AARemoveMana::resolve() { if (player->doesntEmpty->getConvertedCost() && !player->poolDoesntEmpty->getConvertedCost()) { - ManaCost * toRemove = manaPool->Diff(player->doesntEmpty); player->getManaPool()->pay(manaPool->Diff(player->doesntEmpty)); return 1; } @@ -2994,7 +2988,7 @@ AAUntapper * AAUntapper::clone() const return NEW AAUntapper(*this); } -AAWhatsMax::AAWhatsMax(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * source, ManaCost * _cost, int value) : +AAWhatsMax::AAWhatsMax(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance *, ManaCost * _cost, int value) : ActivatedAbility(observer, id, card, _cost, 0), value(value) { } @@ -3083,7 +3077,7 @@ MTGAbility(observer, _id, _source), tcString(Tc), manaString(mana) { } -void ANewAffinity::Update(float dt) +void ANewAffinity::Update(float) { testDestroy(); return; @@ -3334,7 +3328,7 @@ int MenuAbility::testDestroy() } int MenuAbility::isReactingToTargetClick(Targetable * card){return MayAbility::isReactingToTargetClick(card);} -int MenuAbility::reactToTargetClick(Targetable * object){return 1;} +int MenuAbility::reactToTargetClick(Targetable *){return 1;} int MenuAbility::reactToChoiceClick(Targetable * object,int choice,int control) { @@ -3938,7 +3932,7 @@ for (it = types.begin(); it != types.end(); it++) return MTGAbility::addToGame(); } - int ATransformer::reapplyCountersBonus(MTGCardInstance * rtarget,bool powerapplied,bool toughnessapplied) + int ATransformer::reapplyCountersBonus(MTGCardInstance * rtarget,bool , bool toughnessapplied) { if(!rtarget->counters || !rtarget->counters->counters.size()) return 0; @@ -4478,7 +4472,7 @@ APreventDamageTypesUEOT::~APreventDamageTypesUEOT() } //AVanishing creature also fading -AVanishing::AVanishing(GameObserver* observer, int _id, MTGCardInstance * card, ManaCost * _cost, int restrictions, int amount, string counterName) : +AVanishing::AVanishing(GameObserver* observer, int _id, MTGCardInstance * card, ManaCost *, int, int amount, string counterName) : MTGAbility(observer, _id, source, target),amount(amount),counterName(counterName) { target = card; @@ -4657,7 +4651,7 @@ AUpkeep::~AUpkeep() } //A Phase based Action -APhaseAction::APhaseAction(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int restrictions, int _phase,bool forcedestroy,bool next,bool myturn,bool opponentturn,bool once) : +APhaseAction::APhaseAction(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance *, string sAbility, int, int _phase,bool forcedestroy,bool next,bool myturn,bool opponentturn,bool once) : MTGAbility(observer, _id, card),sAbility(sAbility), phase(_phase),forcedestroy(forcedestroy),next(next),myturn(myturn),opponentturn(opponentturn),once(once) { abilityId = _id; @@ -5029,7 +5023,7 @@ ABlinkGeneric::~ABlinkGeneric() } // target becomes blocked by source -AABlock::AABlock(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost) : +AABlock::AABlock(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost *) : InstantAbility(observer, id, card, target) { target = _target; @@ -5053,7 +5047,7 @@ AABlock * AABlock::clone() const } // target becomes pair of source -PairCard::PairCard(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost) : +PairCard::PairCard(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost *) : InstantAbility(observer, id, card, target) { target = _target; @@ -5078,7 +5072,7 @@ PairCard * PairCard::clone() const return NEW PairCard(*this); } //target is dredged -dredgeCard::dredgeCard(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost) : +dredgeCard::dredgeCard(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost *) : InstantAbility(observer, id, card, target) { target = _target; @@ -5108,7 +5102,7 @@ dredgeCard * dredgeCard::clone() const } // target becomes a parent of card(source) -AAConnect::AAConnect(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost) : +AAConnect::AAConnect(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost *) : InstantAbility(observer, id, card, target) { target = _target; @@ -5267,7 +5261,7 @@ void ATutorialMessage::Update(float dt) } } -void ATutorialMessage::ButtonPressed(int controllerId, int controlId) +void ATutorialMessage::ButtonPressed(int, int) { //TODO : cancel ALL tips/tutorials for JGE_BTN_SEC? if (mLimit) diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp index aec0cb7e0..f6e017516 100644 --- a/projects/mtg/src/CardSelector.cpp +++ b/projects/mtg/src/CardSelector.cpp @@ -44,7 +44,7 @@ struct Diff: public Exp }; struct True: public Exp { - static inline bool test(CardSelector::Target* ref, CardSelector::Target* test) + static inline bool test(CardSelector::Target*, CardSelector::Target*) { return true; } diff --git a/projects/mtg/src/DeckManager.cpp b/projects/mtg/src/DeckManager.cpp index 8eb638ba9..7faa3c888 100644 --- a/projects/mtg/src/DeckManager.cpp +++ b/projects/mtg/src/DeckManager.cpp @@ -232,7 +232,6 @@ int DeckManager::getDifficultyRating(Player *statsPlayer, Player *player) if (meta) { - int diff = meta->getVictoryPercentage(); meta->mPlayerDeck = statsPlayer->GetCurrentDeckStatsFile(); meta->mStatsFilename = player->deckFileSmall; meta->LoadStats(); diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 0869fe623..6c589a67a 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -37,7 +37,7 @@ hgeParticleSystem* DeckMenu::stars = NULL; // TODO: // *** Need to make this configurable in a file somewhere to allow for class reuse -DeckMenu::DeckMenu(int id, JGuiListener* listener, int fontId, const string _title, const int& startIndex, bool showDetailsOverride) : +DeckMenu::DeckMenu(int id, JGuiListener* listener, int fontId, const string _title, const int&, bool showDetailsOverride) : JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsScreen( showDetailsOverride ) { diff --git a/projects/mtg/src/DeckMenuItem.cpp b/projects/mtg/src/DeckMenuItem.cpp index 2f53c5347..ee5151ddd 100644 --- a/projects/mtg/src/DeckMenuItem.cpp +++ b/projects/mtg/src/DeckMenuItem.cpp @@ -148,7 +148,7 @@ void DeckMenuItem::Entering() parent->mSelectionTargetY = mY; } -bool DeckMenuItem::Leaving(JButton key) +bool DeckMenuItem::Leaving(JButton) { // check to see if the user clicked on the object, if so return true. checkUserClick(); diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index cfa63dc4c..15cad1690 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -1963,7 +1963,7 @@ NetworkGameObserver::~NetworkGameObserver() mpNetworkSession->sendCommand("disconnect", ""); } -void NetworkGameObserver::disconnect(void*pxThis, stringstream& in, stringstream& out) +void NetworkGameObserver::disconnect(void*pxThis, stringstream&, stringstream&) { NetworkGameObserver* pThis = (NetworkGameObserver*)pxThis; pThis->setLoser(pThis->getView()->getRenderedPlayerOpponent()); @@ -1983,7 +1983,7 @@ void NetworkGameObserver::loadPlayer(int playerId, Player* player) mpNetworkSession->sendCommand("loadPlayer", out.str()); } -void NetworkGameObserver::loadPlayer(void*pxThis, stringstream& in, stringstream& out) +void NetworkGameObserver::loadPlayer(void*pxThis, stringstream& in, stringstream&) { NetworkGameObserver* pThis = (NetworkGameObserver*)pxThis; Player* pPlayer = 0; @@ -2027,7 +2027,7 @@ void NetworkGameObserver::synchronize(void*pxThis, stringstream& in, stringstrea } -void NetworkGameObserver::checkSynchro(void*pxThis, stringstream& in, stringstream& out) +void NetworkGameObserver::checkSynchro(void*pxThis, stringstream& in, stringstream&) { NetworkGameObserver* pThis = (NetworkGameObserver*)pxThis; @@ -2038,7 +2038,7 @@ void NetworkGameObserver::checkSynchro(void*pxThis, stringstream& in, stringstre assert(aGame == *pThis); } -void NetworkGameObserver::sendAction(void*pxThis, stringstream& in, stringstream& out) +void NetworkGameObserver::sendAction(void*pxThis, stringstream& in, stringstream&) { NetworkGameObserver* pThis = (NetworkGameObserver*)pxThis; @@ -2055,4 +2055,4 @@ void NetworkGameObserver::logAction(const string& s) mpNetworkSession->sendCommand("sendAction", s); } -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/src/GameStateAwards.cpp b/projects/mtg/src/GameStateAwards.cpp index b10f70a25..2efa29aab 100644 --- a/projects/mtg/src/GameStateAwards.cpp +++ b/projects/mtg/src/GameStateAwards.cpp @@ -389,7 +389,7 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId) } } -void GameStateAwards::OnScroll(int inXVelocity, int inYVelocity) +void GameStateAwards::OnScroll(int, int inYVelocity) { if (abs(inYVelocity) > 300) { diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 23afedb31..adc5b24f6 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -1119,19 +1119,35 @@ void GameStateDeckViewer::renderOnScreenMenu() for (int j = 0; j < Constants::NB_Colors - 1; j++) { curCount = stw->countBasicLandsPerColor[j]; - sprintf(buffer, (curCount == 0 ? "." : "%i"), curCount); + if(curCount == 0) { + sprintf(buffer, "."); + } else { + sprintf(buffer, "%i", curCount); + } font->DrawString(buffer, 49 + leftTransition + j * 15, posY); curCount = stw->countLandsPerColor[j]; - sprintf(buffer, (curCount == 0 ? "." : "%i"), curCount); + if(curCount == 0) { + sprintf(buffer, "."); + } else { + sprintf(buffer, "%i", curCount); + } font->DrawString(buffer, 49 + leftTransition + j * 15, posY + 10); curCount = stw->countNonLandProducersPerColor[j]; - sprintf(buffer, (curCount == 0 ? "." : "%i"), curCount); + if(curCount == 0) { + sprintf(buffer, "."); + } else { + sprintf(buffer, "%i", curCount); + } font->DrawString(buffer, 49 + leftTransition + j * 15, posY + 20); curCount = stw->countLandsPerColor[j] + stw->countBasicLandsPerColor[j] + stw->countNonLandProducersPerColor[j]; - sprintf(buffer, (curCount == 0 ? "." : "%i"), curCount); + if(curCount == 0) { + sprintf(buffer, "."); + } else { + sprintf(buffer, "%i", curCount); + } font->DrawString(buffer, 49 + leftTransition + j * 15, posY + 33); } diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index e51094285..42c31533e 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -766,9 +766,9 @@ void GameStateMenu::Render() else { if (primitivesLoadCounter <= (int) (primitives.size())) - sprintf(text, _("LOADING PRIMITIVES").c_str()); + sprintf(text, "%s", _("LOADING PRIMITIVES").c_str()); else - sprintf(text, _("LOADING...").c_str()); + sprintf(text, "%s", _("LOADING...").c_str()); } mFont->SetColor(ARGB(170,0,0,0)); mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER); diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 2238105c9..716eb5a3b 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -110,7 +110,6 @@ void GameStateShop::Start() srcCards->addFilter(NEW WCFilterNOT(NEW WCFilterRarity("T"))); srcCards->addFilter(NEW WCFilterNOT(NEW WCFilterSet(MTGSets::INTERNAL_SET))); - bigSync = 0; shopMenu = NEW WGuiMenu(JGE_BTN_DOWN, JGE_BTN_UP, true, &bigSync); MTGAllCards * ac = MTGCollection(); playerdata = NEW PlayerData(ac); @@ -265,7 +264,7 @@ void GameStateShop::cancelCard(int controlId) //Prices do not immediately go down when you ignore something. return; } -void GameStateShop::cancelBooster(int controlId) +void GameStateShop::cancelBooster(int) { return; //TODO FIXME Tie boosters into pricelist. } @@ -867,7 +866,7 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId) menu->Close(); } -void GameStateShop::OnScroll(int inXVelocity, int inYVelocity) +void GameStateShop::OnScroll(int inXVelocity, int) { // we ignore magnitude since there isn't any scrolling in the shop if (abs(inXVelocity) > 200) @@ -980,7 +979,7 @@ int ShopBooster::maxInventory() return 2; return 5; } -void ShopBooster::addToDeck(MTGDeck * d, WSrcCards * srcCards) +void ShopBooster::addToDeck(MTGDeck * d, WSrcCards *) { if (!pack) { //A combination booster. diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index ca712cf21..46265e209 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/projects/mtg/src/GuiCombat.cpp @@ -18,7 +18,7 @@ const float kZoom_level3 = 2.7f; struct True: public Exp { - static inline bool test(DamagerDamaged* ref, DamagerDamaged* test) + static inline bool test(DamagerDamaged*, DamagerDamaged*) { return true; } @@ -90,7 +90,7 @@ void GuiCombat::Update(float dt) enemy_avatar.Update(dt); } -void GuiCombat::remaskBlkViews(AttackerDamaged* before, AttackerDamaged* after) +void GuiCombat::remaskBlkViews(AttackerDamaged*, AttackerDamaged* after) { if (after) { @@ -155,7 +155,7 @@ void GuiCombat::addOne(DefenserDamaged* blocker, CombatStep step) } } } -void GuiCombat::removeOne(DefenserDamaged* blocker, CombatStep step) +void GuiCombat::removeOne(DefenserDamaged* blocker, CombatStep) { blocker->addDamage(-1, activeAtk); for (vector::iterator it = activeAtk->blockers.begin(); it != activeAtk->blockers.end(); ++it) diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index 6e82ce290..ef318c8c9 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -23,7 +23,7 @@ bool HandLimitor::select(Target* t) else return false; } -bool HandLimitor::greyout(Target* t) +bool HandLimitor::greyout(Target*) { return true; } diff --git a/projects/mtg/src/GuiPhaseBar.cpp b/projects/mtg/src/GuiPhaseBar.cpp index 22d3e4ee9..73aa782d9 100644 --- a/projects/mtg/src/GuiPhaseBar.cpp +++ b/projects/mtg/src/GuiPhaseBar.cpp @@ -33,7 +33,7 @@ namespace const float ICONSCALE = 1.5; const float CENTER = SCREEN_HEIGHT_F / 2 + 10; - void DrawGlyph(JQuad* inQuad, int inGlyph, float inY, float inAngle, unsigned int inP, float inScale) + void DrawGlyph(JQuad* inQuad, int inGlyph, float inY, float, unsigned int inP, float inScale) { float xPos = static_cast ((inP + inGlyph * (int) (kWidth + 1)) % (kPhases * (int) (kWidth + 1))); inQuad->SetTextureRect(xPos, 0, kWidth, kHeight); @@ -87,7 +87,7 @@ void GuiPhaseBar::Entering() zoom = 1.4f*ICONSCALE; } -bool GuiPhaseBar::Leaving(JButton key) +bool GuiPhaseBar::Leaving(JButton) { mHasFocus = false; zoom = ICONSCALE; diff --git a/projects/mtg/src/GuiStatic.cpp b/projects/mtg/src/GuiStatic.cpp index 96397f2c5..4269577c9 100644 --- a/projects/mtg/src/GuiStatic.cpp +++ b/projects/mtg/src/GuiStatic.cpp @@ -13,7 +13,7 @@ void GuiStatic::Entering() parent->Activate(this); } -bool GuiStatic::Leaving(JButton key) +bool GuiStatic::Leaving(JButton) { parent->Deactivate(this); return false; @@ -186,7 +186,7 @@ void GuiGameZone::Render() PlayGuiObject::Render(); } -void GuiGameZone::ButtonPressed(int controllerId, int controlId) +void GuiGameZone::ButtonPressed(int, int) { zone->owner->getObserver()->ButtonPressed(this); } diff --git a/projects/mtg/src/IconButton.cpp b/projects/mtg/src/IconButton.cpp index 0f5a5c06a..75515b478 100644 --- a/projects/mtg/src/IconButton.cpp +++ b/projects/mtg/src/IconButton.cpp @@ -109,7 +109,7 @@ void IconButton::Entering() mTargetScale = SCALE_SELECTED * mScale; } -bool IconButton::Leaving(JButton key) +bool IconButton::Leaving(JButton) { mHasFocus = false; mTargetScale = SCALE_NORMAL * mScale; diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index e9897e3e0..48cecee25 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -625,7 +625,7 @@ TargetChooser * AbilityFactory::parseSimpleTC(const std::string& s, const std::s // evaluate trigger ability // ie auto=@attacking(mytgt):destroy target(*) // eval only the text between the @ and the first : -TriggeredAbility * AbilityFactory::parseTrigger(string s, string magicText, int id, Spell * spell, MTGCardInstance *card, +TriggeredAbility * AbilityFactory::parseTrigger(string s, string, int id, Spell *, MTGCardInstance *card, Targetable * target) { size_t found = string::npos; @@ -3088,7 +3088,7 @@ MTGAbility * AbilityFactory::parsePhaseActionAbility(string s,MTGCardInstance * return NEW APhaseActionGeneric(observer, id, card,_target, trim(splitActions[2]), restrictions, phase,sourceinPlay,next,myturn,opponentturn,once); } -MTGAbility * AbilityFactory::parseChooseActionAbility(string s,MTGCardInstance * card,Spell * spell,MTGCardInstance * target, int restrictions,int id) +MTGAbility * AbilityFactory::parseChooseActionAbility(string s,MTGCardInstance * card,Spell *,MTGCardInstance * target, int, int id) { vector splitChooseAColor2 = parseBetween(s, "activatechooseacolor ", " activatechooseend"); if (splitChooseAColor2.size()) @@ -4127,7 +4127,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell) //ManaRedux -> manaredux(colorless,+2) // -> manaredux(green,-2) -MTGAbility * AbilityFactory::getManaReduxAbility(string s, int id, Spell *spell, MTGCardInstance *card, MTGCardInstance *target) +MTGAbility * AbilityFactory::getManaReduxAbility(string s, int id, Spell *, MTGCardInstance *card, MTGCardInstance *target) { int color = -1; string manaCost = s.substr(s.find(",") + 1); @@ -4770,7 +4770,7 @@ int TriggeredAbility::receiveEvent(WEvent * e) return 0; } -void TriggeredAbility::Update(float dt) +void TriggeredAbility::Update(float) { if (trigger()) fireAbility(); @@ -4822,7 +4822,7 @@ InstantAbility::InstantAbility(GameObserver* observer, int _id, MTGCardInstance init = 0; } -void InstantAbility::Update(float dt) +void InstantAbility::Update(float) { if (!init) { @@ -4988,7 +4988,7 @@ void ListMaintainerAbility::checkTargets() } } -void ListMaintainerAbility::Update(float dt) +void ListMaintainerAbility::Update(float) { updateTargets(); } diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index e81ff4223..a8e6aa50d 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -336,7 +336,7 @@ void MTGAllCards::init() initCounters(); } -int MTGAllCards::load(const char * config_file, const char * set_name, int autoload) +int MTGAllCards::load(const char * config_file, const char * set_name, int) { conf_read_mode = 0; const int set_id = set_name ? setlist.Add(set_name) : MTGSets::INTERNAL_SET; diff --git a/projects/mtg/src/MTGGamePhase.cpp b/projects/mtg/src/MTGGamePhase.cpp index da1cbb0f6..4c93439e3 100644 --- a/projects/mtg/src/MTGGamePhase.cpp +++ b/projects/mtg/src/MTGGamePhase.cpp @@ -12,7 +12,7 @@ MTGGamePhase::MTGGamePhase(GameObserver* g, int id) : mFont->SetBase(0); // using 2nd font } -void MTGGamePhase::Update(float dt) +void MTGGamePhase::Update(float) { int newState = observer->getCurrentGamePhase(); if (newState != currentState) diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 25ecc6fc3..fc1726f1d 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -124,7 +124,6 @@ void MTGPlayerCards::initGame(int shuffle, int draw) void MTGPlayerCards::OptimizedHand(Player * who,int amount, int lands, int creatures, int othercards) { //give the Ai hand adventage to insure a challanging match. - GameObserver * game = who->getObserver(); Player * p = dynamic_cast(who); MTGCardInstance * card = NULL; MTGGameZone * z = p->game->library; @@ -381,7 +380,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone } -void MTGPlayerCards::discardRandom(MTGGameZone * from, MTGCardInstance * source) +void MTGPlayerCards::discardRandom(MTGGameZone * from, MTGCardInstance *) { if (!from->nb_cards) return; diff --git a/projects/mtg/src/MTGPack.cpp b/projects/mtg/src/MTGPack.cpp index 1e439a87c..2aa3ea031 100644 --- a/projects/mtg/src/MTGPack.cpp +++ b/projects/mtg/src/MTGPack.cpp @@ -26,7 +26,7 @@ int MTGPackEntryRandom::addCard(WSrcCards *pool, MTGDeck *to) pool->addFilter(oldf); return fails; } -int MTGPackEntrySpecific::addCard(WSrcCards *pool, MTGDeck *to) +int MTGPackEntrySpecific::addCard(WSrcCards *, MTGDeck *to) { if (!card) return copies; @@ -113,8 +113,6 @@ int MTGPack::assemblePack(MTGDeck *to) for (size_t i = 0; i < slotss.size(); i++) { carryover = slotss[i]->add(p, to, carryover); - if (carryover > 0) - carryover = carryover; //This means we're failing. } SAFE_DELETE(p); return carryover; diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index 6222ed377..29bb9dc65 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -279,7 +279,7 @@ PermanentAbility(observer, _id) aType = MTGAbility::PUT_INTO_PLAY; } -int MTGPutInPlayRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGPutInPlayRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { int cardsinhand = game->players[0]->game->hand->nb_cards; Player * player = game->currentlyActing(); @@ -474,7 +474,7 @@ MTGPutInPlayRule(observer, _id) { aType = MTGAbility::PUT_INTO_PLAY_WITH_KICKER; } -int MTGKickerRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGKickerRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { if(OptionKicker::KICKER_ALWAYS == options[Options::KICKERPAYMENT].number) return 0; @@ -625,7 +625,7 @@ int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * return isReactingToClick( card, mana, alternateCost ); } -int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana, ManaCost *alternateManaCost) +int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost *, ManaCost *alternateManaCost) { Player * player = game->currentlyActing(); Player * currentPlayer = game->currentPlayer; @@ -1024,7 +1024,7 @@ MTGMorphCostRule::MTGMorphCostRule(GameObserver* observer, int _id) : { aType = MTGAbility::MORPH_COST; } -int MTGMorphCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGMorphCostRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { Player * player = game->currentlyActing(); @@ -1153,7 +1153,7 @@ bool MTGAttackRule::select(Target* t) } return false; } -bool MTGAttackRule::greyout(Target* t) +bool MTGAttackRule::greyout(Target*) { return true; } @@ -1164,7 +1164,7 @@ PermanentAbility(observer, _id) aType = MTGAbility::MTG_ATTACK_RULE; } -int MTGAttackRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGAttackRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { if (currentPhase == MTG_PHASE_COMBATATTACKERS && card->controller() == game->currentPlayer && card->controller() == game->currentlyActing())//on my turn and when I am the acting player. { @@ -1238,7 +1238,7 @@ PermanentAbility(observer, _id) aType = MTGAbility::MTG_ATTACK_RULE; } -int MTGPlaneswalkerAttackRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGPlaneswalkerAttackRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { if (currentPhase == MTG_PHASE_COMBATATTACKERS && card->controller() == game->currentPlayer && card->controller() == game->currentlyActing())//on my turn and when I am the acting player. { @@ -1310,7 +1310,7 @@ bool MTGPlaneswalkerAttackRule::select(Target* t) } return false; } -bool MTGPlaneswalkerAttackRule::greyout(Target* t) +bool MTGPlaneswalkerAttackRule::greyout(Target*) { return true; } @@ -1524,7 +1524,7 @@ int MTGBlockRule::receiveEvent(WEvent *e) return 0; } -int MTGBlockRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGBlockRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { if (currentPhase == MTG_PHASE_COMBATBLOCKERS && !game->isInterrupting && card->controller() != game->currentPlayer @@ -1652,7 +1652,7 @@ MTGMomirRule::MTGMomirRule(GameObserver* observer, int _id, MTGAllCards * _colle textAlpha = 0; } -int MTGMomirRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) +int MTGMomirRule::isReactingToClick(MTGCardInstance * card, ManaCost *) { if (alreadyplayed) return 0; @@ -2487,7 +2487,7 @@ int MTGLegendRule::added(MTGCardInstance * card) return 1; } -int MTGLegendRule::removed(MTGCardInstance * card) +int MTGLegendRule::removed(MTGCardInstance *) { return 0; } @@ -2544,7 +2544,7 @@ int MTGPlaneWalkerRule::added(MTGCardInstance * card) return 1; } -int MTGPlaneWalkerRule::removed(MTGCardInstance * card) +int MTGPlaneWalkerRule::removed(MTGCardInstance *) { return 0; } diff --git a/projects/mtg/src/MenuItem.cpp b/projects/mtg/src/MenuItem.cpp index cb359f40c..f8c192427 100644 --- a/projects/mtg/src/MenuItem.cpp +++ b/projects/mtg/src/MenuItem.cpp @@ -91,7 +91,7 @@ void MenuItem::Entering() mTargetScale = 1.3f; } -bool MenuItem::Leaving(JButton key) +bool MenuItem::Leaving(JButton) { if (mParticleSys) mParticleSys->Stop(true); diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp index ca9673b64..a75cda95b 100644 --- a/projects/mtg/src/OptionItem.cpp +++ b/projects/mtg/src/OptionItem.cpp @@ -220,7 +220,7 @@ void OptionProfile::Render() } -void OptionProfile::Entering(JButton key) +void OptionProfile::Entering(JButton) { mFocus = true; initialValue = value; @@ -263,7 +263,7 @@ bool OptionThemeStyle::Visible() return (selections.size() > 1); } -void OptionThemeStyle::confirmChange(bool confirmed) +void OptionThemeStyle::confirmChange(bool) { options.getStyleMan()->determineActive(NULL, NULL); } @@ -642,7 +642,7 @@ void OptionKey::Overlay() btnMenu->Render(); } -void OptionKey::ButtonPressed(int controllerId, int controlId) +void OptionKey::ButtonPressed(int, int controlId) { to = btnList[controlId]; SAFE_DELETE(btnMenu); diff --git a/projects/mtg/src/PlayGuiObjectController.cpp b/projects/mtg/src/PlayGuiObjectController.cpp index 20eb757a8..2e808ad63 100644 --- a/projects/mtg/src/PlayGuiObjectController.cpp +++ b/projects/mtg/src/PlayGuiObjectController.cpp @@ -97,7 +97,7 @@ void PlayGuiObjectController::Update(float dt) } } -bool PlayGuiObjectController::CheckUserInput(JButton key) +bool PlayGuiObjectController::CheckUserInput(JButton) { /* if (!mCount) diff --git a/projects/mtg/src/SimpleButton.cpp b/projects/mtg/src/SimpleButton.cpp index 19a1c7383..9fabd7eac 100644 --- a/projects/mtg/src/SimpleButton.cpp +++ b/projects/mtg/src/SimpleButton.cpp @@ -94,7 +94,7 @@ void SimpleButton::Entering() setFocus(true); } -bool SimpleButton::Leaving(JButton key) +bool SimpleButton::Leaving(JButton) { checkUserClick(); setFocus(false); diff --git a/projects/mtg/src/SimplePad.cpp b/projects/mtg/src/SimplePad.cpp index a8e9db5a1..f9d492c61 100644 --- a/projects/mtg/src/SimplePad.cpp +++ b/projects/mtg/src/SimplePad.cpp @@ -223,7 +223,7 @@ void SimplePad::MoveSelection(unsigned char moveto) else if (moveto == KPD_INPUT) selected = KPD_INPUT; } -void SimplePad::Update(float dt) +void SimplePad::Update(float) { JGE * mEngine = JGE::GetInstance(); diff --git a/projects/mtg/src/SimplePopup.cpp b/projects/mtg/src/SimplePopup.cpp index 7df50faa9..b994d9c61 100644 --- a/projects/mtg/src/SimplePopup.cpp +++ b/projects/mtg/src/SimplePopup.cpp @@ -86,7 +86,7 @@ void SimplePopup::Update(DeckMetaData* selectedDeck) } -string SimplePopup::getDetailedInformation(string filename) +string SimplePopup::getDetailedInformation(string) { ostringstream oss; oss @@ -120,7 +120,7 @@ string SimplePopup::getDetailedInformation(string filename) return oss.str(); } -void SimplePopup::Update(float dt) +void SimplePopup::Update(float) { JButton key = mEngine->ReadButton(); CheckUserInput(key); diff --git a/projects/mtg/src/StoryFlow.cpp b/projects/mtg/src/StoryFlow.cpp index 5eac5828c..b77c40efd 100644 --- a/projects/mtg/src/StoryFlow.cpp +++ b/projects/mtg/src/StoryFlow.cpp @@ -62,7 +62,7 @@ float StoryText::getHeight() return mFont->GetHeight(); } -void StoryText::Update(float dt) +void StoryText::Update(float) { //Nothing for now } @@ -90,7 +90,7 @@ void StoryReward::Render() StoryText::Render(); } -void StoryReward::Update(float dt) +void StoryReward::Update(float) { if (rewardDone) return; @@ -216,7 +216,7 @@ float StoryImage::getHeight() return 0; } -void StoryImage::Update(float dt) +void StoryImage::Update(float) { //Nothing for now } @@ -266,7 +266,7 @@ void StoryChoice::Entering() mTargetScale = 1.2f; } -bool StoryChoice::Leaving(JButton key) +bool StoryChoice::Leaving(JButton) { mHasFocus = false; mTargetScale = 1.0f; @@ -520,7 +520,7 @@ void StoryDialog::Render() } -void StoryDialog::ButtonPressed(int controllerid, int controlid) +void StoryDialog::ButtonPressed(int, int controlid) { if ( controlid == kInfoMenuID ) return; diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp index eb8cef680..716f5316c 100644 --- a/projects/mtg/src/TargetChooser.cpp +++ b/projects/mtg/src/TargetChooser.cpp @@ -925,7 +925,7 @@ int TargetChooser::countValidTargets() return result; } -bool TargetChooser::equals(TargetChooser * tc) +bool TargetChooser::equals(TargetChooser *) { //This function always return 1 for now, since the default TargetChooser targets everything @@ -1276,7 +1276,7 @@ PlayerTargetChooser::PlayerTargetChooser(GameObserver *observer, MTGCardInstance { } -bool PlayerTargetChooser::canTarget(Targetable * target,bool withoutProtections) +bool PlayerTargetChooser::canTarget(Targetable * target,bool) { if (source && targetter && (targetter->controller() != targetter->controller()->opponent()) && (targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD)) @@ -1354,7 +1354,7 @@ SpellTargetChooser::SpellTargetChooser(GameObserver *observer, MTGCardInstance * color = _color; } -bool SpellTargetChooser::canTarget(Targetable * target,bool withoutProtections) +bool SpellTargetChooser::canTarget(Targetable * target,bool) { Spell * spell = dynamic_cast(target); if (!spell) @@ -1442,7 +1442,7 @@ DamageTargetChooser::DamageTargetChooser(GameObserver *observer, MTGCardInstance state = _state; } -bool DamageTargetChooser::canTarget(Targetable * target,bool withoutProtections) +bool DamageTargetChooser::canTarget(Targetable * target, bool) { if ( Damage * damage = dynamic_cast(target)) { @@ -1481,12 +1481,12 @@ TriggerTargetChooser::TriggerTargetChooser(GameObserver *observer, int _triggerT target = NULL; } -bool TriggerTargetChooser::targetsZone(MTGGameZone * z) +bool TriggerTargetChooser::targetsZone(MTGGameZone *) { return true; } -bool TriggerTargetChooser::canTarget(Targetable * _target,bool withoutProtections) +bool TriggerTargetChooser::canTarget(Targetable * _target,bool) { if (_target == target) return true; return false; @@ -1512,7 +1512,7 @@ bool TriggerTargetChooser::equals(TargetChooser * tc) } /*my curses */ -bool myCursesChooser::canTarget(Targetable * target,bool withoutProtections) +bool myCursesChooser::canTarget(Targetable * target,bool) { for(unsigned int i = 0;i < source->controller()->curses.size();++i) { @@ -1576,7 +1576,7 @@ bool BlockableChooser::equals(TargetChooser * tc) } /*display cards pairable by source */ -bool pairableChooser::canTarget(Targetable * target,bool withoutProtections) +bool pairableChooser::canTarget(Targetable * target,bool) { if (MTGCardInstance * card = dynamic_cast(target)) { @@ -1610,7 +1610,7 @@ bool pairableChooser::equals(TargetChooser * tc) } //*Dredge targetchooser*// -bool dredgeChooser::canTarget(Targetable * target,bool withoutProtections) +bool dredgeChooser::canTarget(Targetable * target,bool) { if (MTGCardInstance * card = dynamic_cast(target)) { diff --git a/projects/mtg/src/Tasks.cpp b/projects/mtg/src/Tasks.cpp index aefe1ad86..d1e32a63b 100644 --- a/projects/mtg/src/Tasks.cpp +++ b/projects/mtg/src/Tasks.cpp @@ -548,7 +548,7 @@ void TaskList::Render() f->SetScale(1); } -void TaskList::addRandomTask(int diff) +void TaskList::addRandomTask(int) { // TODO: Weighted random (rarity of tasks) // - based on counts of finished tasks? @@ -614,7 +614,7 @@ string TaskWinAgainst::getShortDesc() return result; } -bool TaskWinAgainst::isDone(GameObserver* observer, GameApp * _app) +bool TaskWinAgainst::isDone(GameObserver* observer, GameApp *) { AIPlayerBaka * baka = (AIPlayerBaka*) observer->players[1]; return ((baka) && (!observer->players[0]->isAI()) && (observer->players[1]->isAI()) && (observer->didWin(observer->players[0])) // Human player wins @@ -821,7 +821,7 @@ string TaskImmortal::getShortDesc() return buffer; } -bool TaskImmortal::isDone(GameObserver *observer, GameApp * _app) +bool TaskImmortal::isDone(GameObserver *observer, GameApp *) { return (!observer->players[0]->isAI()) && (observer->players[1]->isAI()) && (observer->didWin(observer->players[0])) // Human player wins && (observer->players[0]->life >= targetLife); @@ -916,7 +916,7 @@ string TaskMassiveBurial::getShortDesc() return buffer; } -bool TaskMassiveBurial::isDone(GameObserver* observer, GameApp * _app) +bool TaskMassiveBurial::isDone(GameObserver* observer, GameApp *) { int countColor = 0; vector cards = observer->players[1]->game->graveyard->cards; @@ -1009,7 +1009,7 @@ string TaskWisdom::getShortDesc() return buffer; } -bool TaskWisdom::isDone(GameObserver* observer, GameApp * _app) +bool TaskWisdom::isDone(GameObserver* observer, GameApp *) { int countColor = 0; vector cards = observer->players[0]->game->hand->cards; @@ -1090,7 +1090,7 @@ string TaskPacifism::getShortDesc() return buffer; } -bool TaskPacifism::isDone(GameObserver* observer, GameApp * _app) +bool TaskPacifism::isDone(GameObserver* observer, GameApp *) { return (!observer->players[0]->isAI()) && (observer->players[1]->isAI()) && (observer->didWin(observer->players[0])) // Human player wins && (observer->players[1]->life >= lifeSlashCardMin) && ((int) observer->players[1]->game->library->cards.size() >= lifeSlashCardMin); diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp index ef520ed6a..72c53ec1e 100644 --- a/projects/mtg/src/TestSuiteAI.cpp +++ b/projects/mtg/src/TestSuiteAI.cpp @@ -83,7 +83,7 @@ int TestSuiteAI::displayStack() return 1; } -int TestSuiteAI::Act(float dt) +int TestSuiteAI::Act(float) { observer->setLoser(NULL); // Prevent draw rule from losing the game diff --git a/projects/mtg/src/WCachedResource.cpp b/projects/mtg/src/WCachedResource.cpp index 200476878..849d5a119 100644 --- a/projects/mtg/src/WCachedResource.cpp +++ b/projects/mtg/src/WCachedResource.cpp @@ -329,7 +329,7 @@ void WCachedParticles::Refresh() return; } -bool WCachedParticles::Attempt(const string& filename, int submode, int & error) +bool WCachedParticles::Attempt(const string& filename, int, int & error) { JFileSystem* fileSys = JFileSystem::GetInstance(); diff --git a/projects/mtg/src/WDataSrc.cpp b/projects/mtg/src/WDataSrc.cpp index aa817e202..7b11e6d49 100644 --- a/projects/mtg/src/WDataSrc.cpp +++ b/projects/mtg/src/WDataSrc.cpp @@ -35,7 +35,7 @@ bool WSyncable::prev() } //WSrcImage -JQuadPtr WSrcImage::getImage(int offset) +JQuadPtr WSrcImage::getImage(int) { return WResourceManager::Instance()->RetrieveTempQuad(filename); } diff --git a/projects/mtg/src/WFont.cpp b/projects/mtg/src/WFont.cpp index 6a45ede73..fc8ccd414 100644 --- a/projects/mtg/src/WFont.cpp +++ b/projects/mtg/src/WFont.cpp @@ -147,7 +147,7 @@ void WLBFont::FormatText(string &s, vector& output) } } -WFBFont::WFBFont(int inFontID, const char *fontname, int lineheight, bool useVideoRAM) : +WFBFont::WFBFont(int inFontID, const char *fontname, int lineheight, bool) : WFont(inFontID) { mRenderer = JRenderer::GetInstance(); @@ -594,7 +594,7 @@ float WFBFont::GetHeight() const } // Legacy : GBK encoding -WGBKFont::WGBKFont(int inFontID, const char *fontname, int lineheight, bool useVideoRAM) : +WGBKFont::WGBKFont(int inFontID, const char *fontname, int lineheight, bool) : WFBFont(inFontID) { mRenderer = JRenderer::GetInstance(); diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index c98ff90b1..b518ec661 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -80,7 +80,7 @@ bool WGuiBase::yieldFocus() } //WGuiItem -void WGuiItem::Entering(JButton key) +void WGuiItem::Entering(JButton) { mFocus = true; } @@ -95,7 +95,7 @@ float WGuiItem::minHeight() return mFont->GetHeight(); } -bool WGuiItem::Leaving(JButton key) +bool WGuiItem::Leaving(JButton) { mFocus = false; return true; @@ -1496,7 +1496,7 @@ void WGuiCardImage::Render() } //WGuiCardDistort -WGuiCardDistort::WGuiCardDistort(WDataSource * wds, bool _thumb, WDataSource * _distort) : +WGuiCardDistort::WGuiCardDistort(WDataSource * wds, bool _thumb, WDataSource *) : WGuiCardImage(wds, _thumb) { mesh = NEW hgeDistortionMesh(2, 2); @@ -2193,7 +2193,7 @@ void WGuiFilterItem::updateValue() } } -void WGuiFilterItem::ButtonPressed(int controllerId, int controlId) +void WGuiFilterItem::ButtonPressed(int, int controlId) { if (!mParent) return; diff --git a/projects/mtg/src/utils.cpp b/projects/mtg/src/utils.cpp index 9ff796dc6..e690412a7 100644 --- a/projects/mtg/src/utils.cpp +++ b/projects/mtg/src/utils.cpp @@ -83,7 +83,7 @@ void RandomGenerator::loadRandValues(string s) } } -int WRand(bool log) +int WRand(bool) { return rand(); } diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index e1cd118f4..da0ad9120 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -549,7 +549,35 @@ OTHER_FILES += \ android/src/org/kde/necessitas/origo/QtApplication.java \ android/src/org/kde/necessitas/origo/QtActivity.java \ android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \ - android/src/org/kde/necessitas/ministro/IMinistro.aidl + android/src/org/kde/necessitas/ministro/IMinistro.aidl \ + android/src/org/kde/necessitas/ministro/IMinistro.aidl \ + android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \ + android/src/org/qtproject/qt5/android/bindings/QtActivity.java \ + android/src/org/qtproject/qt5/android/bindings/QtApplication.java \ + android/version.xml \ + android/AndroidManifest.xml \ + android/res/values-zh-rCN/strings.xml \ + android/res/values-fa/strings.xml \ + android/res/values-pl/strings.xml \ + android/res/values-de/strings.xml \ + android/res/values-nl/strings.xml \ + android/res/values-id/strings.xml \ + android/res/values-nb/strings.xml \ + android/res/values-ms/strings.xml \ + android/res/values-ja/strings.xml \ + android/res/values-rs/strings.xml \ + android/res/values-it/strings.xml \ + android/res/values-pt-rBR/strings.xml \ + android/res/layout/splash.xml \ + android/res/values-ru/strings.xml \ + android/res/values-zh-rTW/strings.xml \ + android/res/values-et/strings.xml \ + android/res/values-fr/strings.xml \ + android/res/values-ro/strings.xml \ + android/res/values/libs.xml \ + android/res/values/strings.xml \ + android/res/values-es/strings.xml \ + android/res/values-el/strings.xml