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

Fixed a gazillion of warnings occuring when compiling Wagic with Clang with Werror.

Browse Source
This commit is contained in:
Xawotihs@gmail.com
2013-06-09 21:16:39 +00:00
parent 7990540096
commit 26ab65860e
75 changed files with 303 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
projects/mtg/include/ActionElement.h
View File

@@ -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;
}

4
projects/mtg/include/ActionStack.h
View File

@@ -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;
}

69
projects/mtg/include/AllAbilities.h
View File

@@ -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<Damageable *, MTGAbility *> 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<MTGAbility *> 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())
{

1
projects/mtg/include/DamagerDamaged.h
View File

@@ -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);
};

1
projects/mtg/include/DeckMenu.h
View File

@@ -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();

2
projects/mtg/include/GameObserver.h
View File

@@ -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

2
projects/mtg/include/GameState.h
View File

@@ -56,7 +56,7 @@ public:
virtual void Start(){}
virtual void End(){}
virtual void OnScroll(int inXVelocity, int inYVelocity)
virtual void OnScroll(int, int)
{
}

6
projects/mtg/include/GuiLayers.h
View File

@@ -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;
}

1
projects/mtg/include/GuiMana.h
View File

@@ -28,6 +28,7 @@ public:
int color;
void Render();
using Pos::Update;
void Update(float dt, float shift);
void Wither();
void Drop();

16
projects/mtg/include/MTGAbility.h
View File

@@ -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;
}

2
projects/mtg/include/MTGPack.h
View File

@@ -42,7 +42,7 @@ public:
class MTGPackEntryNothing: public MTGPackEntry
{
public:
int addCard(WSrcCards * pool, MTGDeck * to)
int addCard(WSrcCards *, MTGDeck *)
{
return 0;
}

6
projects/mtg/include/PlayGuiObject.h
View File

@@ -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;

4
projects/mtg/include/Player.h
View File

@@ -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;
}

1
projects/mtg/include/SimpleMenu.h
View File

@@ -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; }

2
projects/mtg/include/StoryFlow.h
View File

@@ -21,7 +21,7 @@ public:
{
}
;
bool Leaving(JButton key)
bool Leaving(JButton)
{
return false;
}

4
projects/mtg/include/TargetChooser.h
View File

@@ -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;
}

18
projects/mtg/include/WDataSrc.h
View File

@@ -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();
}

6
projects/mtg/include/WEvent.h
View File

@@ -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 {

4
projects/mtg/include/WFilter.h
View File

@@ -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;
}

6
projects/mtg/include/WFont.h
View File

@@ -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<string>& output) {};
void SetTracking(float) {};
void SetBase(int) {};
void FormatText(string &, vector<string>&) {};
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;

32
projects/mtg/include/WGui.h
View File

@@ -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;