summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-18 19:41:29 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-18 19:41:29 +0300
commit01b26b05ec787cb8cbfce27474362f5c29650f60 (patch)
treeb1cc26b1ef4f6745d5b607df1093bb070f3939bb
parent3b999f51c740d0541c53d223518e5e4bb482d996 (diff)
downloadplus-01b26b05ec787cb8cbfce27474362f5c29650f60.tar.gz
plus-01b26b05ec787cb8cbfce27474362f5c29650f60.tar.bz2
plus-01b26b05ec787cb8cbfce27474362f5c29650f60.tar.xz
plus-01b26b05ec787cb8cbfce27474362f5c29650f60.zip
Fix compilation warnings.
-rw-r--r--src/avatar.h3
-rw-r--r--src/being.cpp1
-rw-r--r--src/gui/setup_relations.cpp1
-rw-r--r--src/guild.h2
-rw-r--r--src/listener.h2
-rw-r--r--src/net/beinghandler.h3
-rw-r--r--src/net/buysellhandler.h3
-rw-r--r--src/net/ea/partyhandler.cpp2
-rw-r--r--src/net/ea/specialhandler.cpp3
-rw-r--r--src/net/tmwa/messagein.cpp4
-rw-r--r--src/net/tradehandler.h3
-rw-r--r--src/party.h2
-rw-r--r--src/resources/resourcemanager.cpp2
-rw-r--r--src/utils/sha256.cpp2
14 files changed, 16 insertions, 17 deletions
diff --git a/src/avatar.h b/src/avatar.h
index 83f4a586a..6c79dd96a 100644
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -35,6 +35,9 @@ class Avatar
public:
Avatar(const std::string &name = "");
+ virtual ~Avatar()
+ { }
+
/**
* Returns the avatar's name.
*/
diff --git a/src/being.cpp b/src/being.cpp
index 532e6e2cf..2ed05449a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -84,7 +84,6 @@
#include "debug.h"
#define CACHE_SIZE 50
-#define HAIR_FILE "hair.xml"
static const int DEFAULT_BEING_WIDTH = 32;
static const int DEFAULT_BEING_HEIGHT = 32;
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 489d5a818..57a51e435 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -228,7 +228,6 @@ public:
#define ACTION_OLD "old"
#define ACTION_TABLE "table"
#define ACTION_STRATEGY "strategy"
-#define ACTION_WHISPER_TAB "whisper tab"
Setup_Relations::Setup_Relations():
mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
diff --git a/src/guild.h b/src/guild.h
index 62135e9ad..915dda5e7 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -65,7 +65,7 @@ protected:
class Guild : public AvatarListModel
{
public:
- ~Guild();
+ virtual ~Guild();
/**
* Set the guild's name.
diff --git a/src/listener.h b/src/listener.h
index 8993c31af..cccc026c6 100644
--- a/src/listener.h
+++ b/src/listener.h
@@ -32,7 +32,7 @@ namespace Mana
class Listener
{
public:
- ~Listener();
+ virtual ~Listener();
void listen(Channels channel);
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 07279b148..bc1491ada 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -32,6 +32,9 @@ namespace Net
class BeingHandler
{
public:
+ virtual ~BeingHandler()
+ { }
+
virtual void handleMessage(Net::MessageIn &msg) = 0;
virtual void requestNameById(int id) = 0;
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 213da227d..ad70c2884 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -34,6 +34,9 @@ namespace Net
class BuySellHandler
{
public:
+ virtual ~BuySellHandler()
+ { }
+
virtual void handleMessage(Net::MessageIn &msg) = 0;
virtual void requestSellList(std::string nick) = 0;
virtual void requestBuyList(std::string nick) = 0;
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index e006b9c71..36e192ce8 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -34,8 +34,6 @@
#include "debug.h"
-#define PARTY_ID 1
-
namespace Ea
{
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 4f0f22aed..b78531434 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -50,8 +50,6 @@
#define BSKILL_CREATECHAT 0x0003
#define BSKILL_JOINPARTY 0x0004
#define BSKILL_SHOUT 0x0005
-#define BSKILL_PK 0x0006 // ??
-#define BSKILL_SETALLIGN 0x0007 // ??
/** reasons why action failed */
#define RFAIL_SKILLDEP 0x00
@@ -64,7 +62,6 @@
#define RFAIL_REDGEM 0x07
#define RFAIL_BLUEGEM 0x08
#define RFAIL_OVERWEIGHT 0x09
-#define RFAIL_GENERIC 0x0a
/** should always be zero if failed */
#define SKILL_FAILED 0x00
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index fb1986597..5a9d39211 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -33,10 +33,6 @@
#include "debug.h"
-#define MAKEWORD(low, high) \
- ((unsigned short)(((unsigned char)(low)) | \
- ((unsigned short)((unsigned char)(high))) << 8))
-
namespace TmwAthena
{
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 837c53eeb..f099efe53 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -38,6 +38,9 @@ namespace Net
class TradeHandler
{
public:
+ virtual ~TradeHandler()
+ { }
+
virtual void request(Being *being A_UNUSED)
{ }
// virtual ~TradeHandler() {}
diff --git a/src/party.h b/src/party.h
index e286a794a..73c45214a 100644
--- a/src/party.h
+++ b/src/party.h
@@ -167,7 +167,7 @@ private:
*/
Party(short id);
- ~Party();
+ virtual ~Party();
MemberList mMembers;
std::string mName;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ee325e253..fcba17812 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -48,8 +48,6 @@
#include "debug.h"
-#define THEMES_FOLDER "themes"
-
ResourceManager *ResourceManager::instance = NULL;
ResourceManager::ResourceManager() :
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 1e7143300..523c021a4 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -101,7 +101,7 @@ class SHA256Context
#define SHFR(x, n) (x >> n)
#define ROTR(x, n) ((x >> n) | (x << ((sizeof(x) << 3) - n)))
-#define ROTL(x, n) ((x << n) | (x >> ((sizeof(x) << 3) - n)))
+//#define ROTL(x, n) ((x << n) | (x >> ((sizeof(x) << 3) - n)))
#define CH(x, y, z) ((x & y) ^ (~x & z))
#define MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))