summaryrefslogtreecommitdiff
path: root/src/net
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
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')
-rw-r--r--src/net/charhandler.h6
-rw-r--r--src/net/download.h4
-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
-rw-r--r--src/net/eathena/gamehandler.h4
-rw-r--r--src/net/eathena/loginhandler.h8
-rw-r--r--src/net/eathena/network.h4
-rw-r--r--src/net/eathena/npchandler.h2
-rw-r--r--src/net/gamehandler.h4
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/loginhandler.h18
-rw-r--r--src/net/messagein.h8
-rw-r--r--src/net/messageout.h4
-rw-r--r--src/net/net.h32
-rw-r--r--src/net/packetcounters.h8
-rw-r--r--src/net/partyhandler.h4
-rw-r--r--src/net/playerhandler.h7
-rw-r--r--src/net/serverinfo.h4
-rw-r--r--src/net/tmwa/gamehandler.h4
-rw-r--r--src/net/tmwa/loginhandler.h8
-rw-r--r--src/net/tmwa/network.h4
-rw-r--r--src/net/tmwa/npchandler.h2
32 files changed, 104 insertions, 101 deletions
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 54b7704e7..15f371f26 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -87,11 +87,11 @@ class CharHandler
virtual void switchCharacter() = 0;
- virtual unsigned int baseSprite() const = 0;
+ virtual unsigned int baseSprite() const A_WARN_UNUSED = 0;
- virtual unsigned int hairSprite() const = 0;
+ virtual unsigned int hairSprite() const A_WARN_UNUSED = 0;
- virtual unsigned int maxSprite() const = 0;
+ virtual unsigned int maxSprite() const A_WARN_UNUSED = 0;
virtual void clear() = 0;
diff --git a/src/net/download.h b/src/net/download.h
index 8931c8200..fcfe539ac 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -88,12 +88,12 @@ class Download final
*/
void cancel();
- char *getError();
+ char *getError() A_WARN_UNUSED;
void setIgnoreError(bool n)
{ mIgnoreError = n; }
- static unsigned long fadler32(FILE *file);
+ static unsigned long fadler32(FILE *file) A_WARN_UNUSED;
static void addProxy(CURL *curl);
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);
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index dc661157a..c627341a4 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -44,7 +44,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
void connect();
- bool isConnected();
+ bool isConnected() A_WARN_UNUSED;
void disconnect();
@@ -60,7 +60,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
void processMapCharId(Net::MessageIn &msg);
- bool mustPing() const
+ bool mustPing() const A_WARN_UNUSED
{ return true; }
};
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index ab7ae482a..2b683f044 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -49,21 +49,21 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
void connect();
- bool isConnected();
+ bool isConnected() A_WARN_UNUSED;
void disconnect();
- int supportedOptionalActions() const
+ int supportedOptionalActions() const A_WARN_UNUSED
{ return SetGenderOnRegister; }
- unsigned int getMaxPasswordLength() const
+ unsigned int getMaxPasswordLength() const A_WARN_UNUSED
{ return 25; }
void changePassword(const std::string &username,
const std::string &oldPassword,
const std::string &newPassword);
- ServerInfo *getCharServer();
+ ServerInfo *getCharServer() A_WARN_UNUSED;
void processServerVersion(Net::MessageIn &msg);
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index e66a3c642..745867b48 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -60,14 +60,14 @@ class Network final : public Ea::Network
bool messageReady();
- MessageIn *getNextMessage();
+ MessageIn *getNextMessage() A_WARN_UNUSED;
void dispatchMessages();
protected:
friend class MessageOut;
- static Network *instance();
+ static Network *instance() A_WARN_UNUSED;
typedef std::map<uint16_t, MessageHandler*> MessageHandlers;
typedef MessageHandlers::iterator MessageHandlerIterator;
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index cc6dd499d..db03a7eb7 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -66,7 +66,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void sellItem(int beingId, int itemId, int amount);
- int getNpc(Net::MessageIn &msg, bool haveLength);
+ int getNpc(Net::MessageIn &msg, bool haveLength) A_WARN_UNUSED;
void processNpcCutin(Net::MessageIn &msg, int npcId);
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index a9713a30a..512972b23 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -55,9 +55,9 @@ class GameHandler
/**
* Tells whether the protocol is using the MP status bar
*/
- virtual bool canUseMagicBar() const = 0;
+ virtual bool canUseMagicBar() const A_WARN_UNUSED = 0;
- virtual bool mustPing() const = 0;
+ virtual bool mustPing() const A_WARN_UNUSED = 0;
};
} // namespace Net
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 5d6062710..9be6daceb 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -60,7 +60,7 @@ class InventoryHandler
int destination) = 0;
// TODO: fix/remove me
- virtual size_t getSize(int type) const = 0;
+ virtual size_t getSize(int type) const A_WARN_UNUSED = 0;
virtual int convertFromServerSlot(int eAthenaSlot) const = 0;
};
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 1366e30dd..ed2ecc313 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -52,34 +52,34 @@ class LoginHandler
void setServer(const ServerInfo &server)
{ mServer = server; }
- ServerInfo getServer() const
+ ServerInfo getServer() const A_WARN_UNUSED
{ return mServer; }
virtual void connect() = 0;
- virtual bool isConnected() = 0;
+ virtual bool isConnected() A_WARN_UNUSED = 0;
virtual void disconnect() = 0;
/**
* @see OptionalAction
*/
- virtual int supportedOptionalActions() const = 0;
+ virtual int supportedOptionalActions() const A_WARN_UNUSED = 0;
- virtual bool isRegistrationEnabled() = 0;
+ virtual bool isRegistrationEnabled() A_WARN_UNUSED = 0;
virtual void getRegistrationDetails() = 0;
- virtual unsigned int getMinUserNameLength() const
+ virtual unsigned int getMinUserNameLength() const A_WARN_UNUSED
{ return 4; }
- virtual unsigned int getMaxUserNameLength() const
+ virtual unsigned int getMaxUserNameLength() const A_WARN_UNUSED
{ return 25; }
- virtual unsigned int getMinPasswordLength() const
+ virtual unsigned int getMinPasswordLength() const A_WARN_UNUSED
{ return 4; }
- virtual unsigned int getMaxPasswordLength() const
+ virtual unsigned int getMaxPasswordLength() const A_WARN_UNUSED
{ return 255; }
virtual void loginAccount(LoginData *loginData) = 0;
@@ -99,7 +99,7 @@ class LoginHandler
virtual void unregisterAccount(const std::string &username,
const std::string &password) = 0;
- virtual Worlds getWorlds() const = 0;
+ virtual Worlds getWorlds() const A_WARN_UNUSED = 0;
virtual void clearWorlds() = 0;
diff --git a/src/net/messagein.h b/src/net/messagein.h
index d8cdf96e2..d17a49f5d 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -45,19 +45,19 @@ class MessageIn
/**
* Returns the message ID.
*/
- int getId() const
+ int getId() const A_WARN_UNUSED
{ return mId; }
/**
* Returns the message length.
*/
- unsigned int getLength() const
+ unsigned int getLength() const A_WARN_UNUSED
{ return mLength; }
/**
* Returns the length of unread data.
*/
- unsigned int getUnreadLength() const
+ unsigned int getUnreadLength() const A_WARN_UNUSED
{ return mLength > mPos ? mLength - mPos : 0; }
virtual unsigned char readInt8(); /**< Reads a byte. */
@@ -105,7 +105,7 @@ class MessageIn
virtual ~MessageIn()
{ }
- static uint8_t fromServerDirection(uint8_t serverDir);
+ static uint8_t fromServerDirection(uint8_t serverDir) A_WARN_UNUSED;
protected:
/**
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 2fb25d38b..89cb02c62 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -65,12 +65,12 @@ class MessageOut
/**
* Returns the content of the message.
*/
- virtual char *getData() const;
+ virtual char *getData() const A_WARN_UNUSED;
/**
* Returns the length of the data.
*/
- virtual unsigned int getDataSize() const;
+ virtual unsigned int getDataSize() const A_WARN_UNUSED;
virtual ~MessageOut()
{ }
diff --git a/src/net/net.h b/src/net/net.h
index ce320591f..3cc4154f3 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -52,23 +52,23 @@ class SpecialHandler;
class TradeHandler;
class BuySellHandler;
-AdminHandler *getAdminHandler();
-BeingHandler *getBeingHandler();
-CharHandler *getCharHandler();
-ChatHandler *getChatHandler();
-GameHandler *getGameHandler();
-GeneralHandler *getGeneralHandler();
-GuildHandler *getGuildHandler();
-InventoryHandler *getInventoryHandler();
-LoginHandler *getLoginHandler();
-NpcHandler *getNpcHandler();
-PartyHandler *getPartyHandler();
-PlayerHandler *getPlayerHandler();
-SpecialHandler *getSpecialHandler();
-TradeHandler *getTradeHandler();
-BuySellHandler *getBuySellHandler();
+AdminHandler *getAdminHandler() A_WARN_UNUSED;
+BeingHandler *getBeingHandler() A_WARN_UNUSED;
+CharHandler *getCharHandler() A_WARN_UNUSED;
+ChatHandler *getChatHandler() A_WARN_UNUSED;
+GameHandler *getGameHandler() A_WARN_UNUSED;
+GeneralHandler *getGeneralHandler() A_WARN_UNUSED;
+GuildHandler *getGuildHandler() A_WARN_UNUSED;
+InventoryHandler *getInventoryHandler() A_WARN_UNUSED;
+LoginHandler *getLoginHandler() A_WARN_UNUSED;
+NpcHandler *getNpcHandler() A_WARN_UNUSED;
+PartyHandler *getPartyHandler() A_WARN_UNUSED;
+PlayerHandler *getPlayerHandler() A_WARN_UNUSED;
+SpecialHandler *getSpecialHandler() A_WARN_UNUSED;
+TradeHandler *getTradeHandler() A_WARN_UNUSED;
+BuySellHandler *getBuySellHandler() A_WARN_UNUSED;
-ServerInfo::Type getNetworkType();
+ServerInfo::Type getNetworkType() A_WARN_UNUSED;
/**
* Handles server detection and connection
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index 34de55889..f629a8a64 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -32,17 +32,17 @@ public:
static void incInPackets();
- static int getInBytes();
+ static int getInBytes() A_WARN_UNUSED;
- static int getInPackets();
+ static int getInPackets() A_WARN_UNUSED;
static void incOutBytes(int cnt);
static void incOutPackets();
- static int getOutBytes();
+ static int getOutBytes() A_WARN_UNUSED;
- static int getOutPackets();
+ static int getOutPackets() A_WARN_UNUSED;
static void update();
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index dd92f78d1..37a1f22c4 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -65,11 +65,11 @@ class PartyHandler
virtual void requestPartyMembers() const = 0;
- virtual PartyShare getShareExperience() const = 0;
+ virtual PartyShare getShareExperience() const A_WARN_UNUSED = 0;
virtual void setShareExperience(PartyShare share) = 0;
- virtual PartyShare getShareItems() const = 0;
+ virtual PartyShare getShareItems() const A_WARN_UNUSED = 0;
virtual void setShareItems(PartyShare share) = 0;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 66193eedc..ca1ce5ea7 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -66,11 +66,12 @@ class PlayerHandler
virtual bool canCorrectAttributes() const = 0;
- virtual PlayerInfo::Attribute getJobLocation() const = 0;
+ virtual PlayerInfo::Attribute getJobLocation() const A_WARN_UNUSED = 0;
- virtual PlayerInfo::Attribute getAttackLocation() const = 0;
+ virtual PlayerInfo::Attribute getAttackLocation()
+ const A_WARN_UNUSED = 0;
- virtual Vector getDefaultWalkSpeed() const = 0;
+ virtual Vector getDefaultWalkSpeed() const A_WARN_UNUSED = 0;
virtual void requestOnlineList() = 0;
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 7be5957d2..d58bd3286 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -74,7 +74,7 @@ public:
version.second = info.version.second;
}
- bool isValid() const
+ bool isValid() const A_WARN_UNUSED
{
return !(hostname.empty() || port == 0 || type == UNKNOWN);
}
@@ -103,7 +103,7 @@ public:
port != other.port);
}
- static Type parseType(const std::string &type)
+ static Type parseType(const std::string &type) A_WARN_UNUSED
{
if (compareStrI(type, "tmwathena") == 0)
return TMWATHENA;
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 8d0c8f073..da5070cbc 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -44,7 +44,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
void connect();
- bool isConnected();
+ bool isConnected() A_WARN_UNUSED;
void disconnect();
@@ -58,7 +58,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
void mapLoadedEvent();
- bool mustPing() const
+ bool mustPing() const A_WARN_UNUSED
{ return false; }
};
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 67afbee09..1a78fbb59 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -49,21 +49,21 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
void connect();
- bool isConnected();
+ bool isConnected() A_WARN_UNUSED;
void disconnect();
- int supportedOptionalActions() const
+ int supportedOptionalActions() const A_WARN_UNUSED
{ return SetGenderOnRegister; }
- unsigned int getMaxPasswordLength() const
+ unsigned int getMaxPasswordLength() const A_WARN_UNUSED
{ return 25; }
void changePassword(const std::string &username,
const std::string &oldPassword,
const std::string &newPassword);
- ServerInfo *getCharServer();
+ ServerInfo *getCharServer() A_WARN_UNUSED;
void processServerVersion(Net::MessageIn &msg);
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 90c48eb19..79b140430 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -61,14 +61,14 @@ class Network final : public Ea::Network
bool messageReady();
- MessageIn *getNextMessage();
+ MessageIn *getNextMessage() A_WARN_UNUSED;
void dispatchMessages();
protected:
friend class MessageOut;
- static Network *instance();
+ static Network *instance() A_WARN_UNUSED;
typedef std::map<uint16_t, MessageHandler*> MessageHandlers;
typedef MessageHandlers::iterator MessageHandlerIterator;
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index de0f3382a..285d775bb 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -66,7 +66,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void sellItem(int beingId, int itemId, int amount);
- int getNpc(Net::MessageIn &msg, bool haveLength);
+ int getNpc(Net::MessageIn &msg, bool haveLength) A_WARN_UNUSED;
void processNpcCommand(Net::MessageIn &msg, int npcId);