summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-30 13:05:34 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-30 13:11:34 +0300
commit0cff44ef5c1383a638c30cc9f5f8c81b6b4318f9 (patch)
tree077c2ff59d6656096aa0acaaf4dd6bf4fb7867f7 /src/net/ea
parent6b1684d33dec02eb6308bb3d8d3707f4d5252ba5 (diff)
downloadmv-0cff44ef5c1383a638c30cc9f5f8c81b6b4318f9.tar.gz
mv-0cff44ef5c1383a638c30cc9f5f8c81b6b4318f9.tar.bz2
mv-0cff44ef5c1383a638c30cc9f5f8c81b6b4318f9.tar.xz
mv-0cff44ef5c1383a638c30cc9f5f8c81b6b4318f9.zip
Add unused warnings to other files.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/ea/charserverhandler.h6
-rw-r--r--src/net/ea/gamehandler.h4
-rw-r--r--src/net/ea/gui/guildtab.h2
-rw-r--r--src/net/ea/gui/partytab.h2
-rw-r--r--src/net/ea/guildhandler.h2
-rw-r--r--src/net/ea/inventoryhandler.h10
-rw-r--r--src/net/ea/loginhandler.h12
-rw-r--r--src/net/ea/network.h12
-rw-r--r--src/net/ea/npchandler.h3
-rw-r--r--src/net/ea/partyhandler.h7
-rw-r--r--src/net/ea/playerhandler.h6
12 files changed, 35 insertions, 33 deletions
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 468368a32..1f9d2a042 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -39,7 +39,7 @@ class BeingHandler : public Net::BeingHandler
protected:
virtual void requestNameById(int id) = 0;
- virtual Being *createBeing(int id, short job);
+ virtual Being *createBeing(int id, short job) A_WARN_UNUSED;
virtual void setSprite(Being *being, unsigned int slot, int id,
std::string color = "",
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index f84d2634e..4c150bdca 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -53,11 +53,11 @@ class CharServerHandler : public Net::CharHandler
virtual void requestCharacters();
- virtual unsigned int baseSprite() const;
+ virtual unsigned int baseSprite() const A_WARN_UNUSED;
- virtual unsigned int hairSprite() const;
+ virtual unsigned int hairSprite() const A_WARN_UNUSED;
- virtual unsigned int maxSprite() const;
+ virtual unsigned int maxSprite() const A_WARN_UNUSED;
virtual void connect() = 0;
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 186bbaa3c..caedae064 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -44,12 +44,12 @@ class GameHandler : public Net::GameHandler, public Listener
virtual void who();
- virtual bool removeDeadBeings() const
+ virtual bool removeDeadBeings() const A_WARN_UNUSED
{ return true; }
virtual void setMap(const std::string &map);
- virtual bool canUseMagicBar() const
+ virtual bool canUseMagicBar() const A_WARN_UNUSED
{ return true; }
virtual void mapLoadedEvent() = 0;
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index b100edf07..293327c4a 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -47,7 +47,7 @@ class GuildTab : public ChatTab
void saveToLogFile(std::string &msg) override;
- int getType() const override
+ int getType() const override A_WARN_UNUSED
{ return ChatTab::TAB_GUILD; }
void playNewMessageSound() override;
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index 1b6b84de7..cfd5bd538 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -45,7 +45,7 @@ class PartyTab : public ChatTab
bool handleCommand(const std::string &type,
const std::string &args) override;
- int getType() const override
+ int getType() const override A_WARN_UNUSED
{ return ChatTab::TAB_PARTY; }
void saveToLogFile(std::string &msg) override;
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index dd326608e..990eac727 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -46,7 +46,7 @@ class GuildHandler : public Net::GuildHandler
void endAlliance(int guildId, int otherGuildId);
- bool isSupported();
+ bool isSupported() A_WARN_UNUSED;
virtual void processGuildCreateResponse(Net::MessageIn &msg);
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 80ddcc25f..694940a12 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -48,7 +48,7 @@ class EquipBackend : public Equipment::Backend
A_DELETE_COPY(EquipBackend)
- Item *getEquipment(int index) const
+ Item *getEquipment(int index) const A_WARN_UNUSED
{
int invyIndex = mEquipment[index];
if (invyIndex == -1)
@@ -146,7 +146,7 @@ class InventoryHandler : public Net::InventoryHandler
~InventoryHandler();
- bool canSplit(const Item *item) const;
+ bool canSplit(const Item *item) const A_WARN_UNUSED;
void splitItem(const Item *item, int amount);
@@ -154,14 +154,14 @@ class InventoryHandler : public Net::InventoryHandler
void openStorage(int type);
- size_t getSize(int type) const;
+ size_t getSize(int type) const A_WARN_UNUSED;
- int convertFromServerSlot(int serverSlot) const;
+ int convertFromServerSlot(int serverSlot) const A_WARN_UNUSED;
void pushPickup(int floorId)
{ mSentPickups.push(floorId); }
- int getSlot(int eAthenaSlot);
+ int getSlot(int eAthenaSlot) A_WARN_UNUSED;
void processPlayerInventory(Net::MessageIn &msg, bool playerInvintory);
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index bd527418b..eebe73ad5 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -45,14 +45,14 @@ class LoginHandler : public Net::LoginHandler
~LoginHandler();
- int supportedOptionalActions() const
+ int supportedOptionalActions() const A_WARN_UNUSED
{ return SetGenderOnRegister; }
- virtual bool isRegistrationEnabled();
+ virtual bool isRegistrationEnabled() A_WARN_UNUSED;
virtual void getRegistrationDetails();
- virtual unsigned int getMaxPasswordLength() const
+ virtual unsigned int getMaxPasswordLength() const A_WARN_UNUSED
{ return 25; }
virtual void loginAccount(LoginData *loginData);
@@ -61,13 +61,13 @@ class LoginHandler : public Net::LoginHandler
virtual void registerAccount(LoginData *loginData);
- virtual Worlds getWorlds() const;
+ virtual Worlds getWorlds() const A_WARN_UNUSED;
virtual void clearWorlds();
- virtual ServerInfo *getCharServer() = 0;
+ virtual ServerInfo *getCharServer() A_WARN_UNUSED = 0;
- const Token &getToken() const
+ const Token &getToken() const A_WARN_UNUSED
{ return mToken; }
virtual void logout();
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 4fbf0ebbe..8148fe63c 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -50,19 +50,19 @@ class Network
void disconnect();
- ServerInfo getServer() const
+ ServerInfo getServer() const A_WARN_UNUSED
{ return mServer; }
- int getState() const
+ int getState() const A_WARN_UNUSED
{ return mState; }
- const std::string &getError() const
+ const std::string &getError() const A_WARN_UNUSED
{ return mError; }
- bool isConnected() const
+ bool isConnected() const A_WARN_UNUSED
{ return mState == CONNECTED; }
- int getInSize() const
+ int getInSize() const A_WARN_UNUSED
{ return mInSize; }
void skip(int len);
@@ -86,7 +86,7 @@ class Network
void setError(const std::string &error);
- uint16_t readWord(const int pos) const;
+ uint16_t readWord(const int pos) const A_WARN_UNUSED;
bool realConnect();
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 6bd038235..053792f6e 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -50,7 +50,8 @@ class NpcHandler : public Net::NpcHandler
void clearDialogs();
- virtual int getNpc(Net::MessageIn &msg, bool haveLength) = 0;
+ virtual int getNpc(Net::MessageIn &msg,
+ bool haveLength) A_WARN_UNUSED = 0;
void processNpcChoice(Net::MessageIn &msg);
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 47ccd5016..fdd2fd533 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -46,10 +46,10 @@ class PartyHandler : public Net::PartyHandler
void requestPartyMembers() const;
- PartyShare getShareExperience() const
+ PartyShare getShareExperience() const A_WARN_UNUSED
{ return mShareExp; }
- PartyShare getShareItems() const
+ PartyShare getShareItems() const A_WARN_UNUSED
{ return mShareItems; }
void reload();
@@ -77,7 +77,8 @@ class PartyHandler : public Net::PartyHandler
virtual void processPartyMessage(Net::MessageIn &msg);
protected:
- PartyShare mShareExp, mShareItems;
+ PartyShare mShareExp;
+ PartyShare mShareItems;
};
extern PartyTab *partyTab;
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index eebb9da96..c090bb126 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -47,11 +47,11 @@ class PlayerHandler : public Net::PlayerHandler
bool canCorrectAttributes() const;
- Vector getDefaultWalkSpeed() const;
+ Vector getDefaultWalkSpeed() const A_WARN_UNUSED;
- PlayerInfo::Attribute getJobLocation() const;
+ PlayerInfo::Attribute getJobLocation() const A_WARN_UNUSED;
- PlayerInfo::Attribute getAttackLocation() const;
+ PlayerInfo::Attribute getAttackLocation() const A_WARN_UNUSED;
void processWalkResponse(Net::MessageIn &msg);