summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-16 22:34:51 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-16 22:34:51 +0300
commitf5c479fa193fb4199872aabcb73d35f872caa87f (patch)
treeb8c5b78b04d363d060cfa3e953f91ed96621a301
parent211132be950db3d94811e2cdf0a349d468b3a824 (diff)
downloadmv-f5c479fa193fb4199872aabcb73d35f872caa87f.tar.gz
mv-f5c479fa193fb4199872aabcb73d35f872caa87f.tar.bz2
mv-f5c479fa193fb4199872aabcb73d35f872caa87f.tar.xz
mv-f5c479fa193fb4199872aabcb73d35f872caa87f.zip
Remove unused externs
-rw-r--r--src/actions/chat.cpp2
-rw-r--r--src/actions/commands.cpp2
-rw-r--r--src/flooritem.cpp1
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/popups/skillpopup.cpp2
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/gui/windows/socialwindow.cpp1
-rw-r--r--src/item.cpp2
-rw-r--r--src/net/ea/adminhandler.cpp2
-rw-r--r--src/net/ea/beinghandler.cpp3
-rw-r--r--src/net/ea/chathandler.cpp2
-rw-r--r--src/net/ea/inventoryhandler.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.cpp1
-rw-r--r--src/net/tmwa/beinghandler.cpp2
-rw-r--r--src/net/tmwa/buysellhandler.cpp1
-rw-r--r--src/net/tmwa/chathandler.cpp2
-rw-r--r--src/net/tmwa/guildhandler.cpp1
-rw-r--r--src/net/tmwa/inventoryhandler.cpp1
-rw-r--r--src/net/tmwa/npchandler.cpp1
-rw-r--r--src/resources/db/colordb.cpp2
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/spritedef.cpp1
-rw-r--r--src/shopitem.cpp2
-rw-r--r--src/utils/chatutils.cpp2
25 files changed, 0 insertions, 43 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index a164e0f23..3d12d99e1 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -44,8 +44,6 @@
#include "debug.h"
-extern unsigned int tmwServerVersion;
-
namespace Actions
{
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index c8829970f..e6dba74f3 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -50,8 +50,6 @@
#include "debug.h"
-extern unsigned int tmwServerVersion;
-
namespace Actions
{
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index f3e7f66d2..5c979f46a 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -42,7 +42,6 @@
#include "debug.h"
-extern int serverVersion;
extern volatile int cur_time;
FloorItem::FloorItem(const int id, const int itemId, const int x, const int y,
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 42eeed6be..fb4c3a9fd 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -46,8 +46,6 @@
#include "debug.h"
-extern int serverVersion;
-
ItemPopup *itemPopup = nullptr;
ItemPopup::ItemPopup() :
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index b92d572fb..6298b7b14 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -92,8 +92,6 @@
#include "debug.h"
-extern int serverVersion;
-
std::string tradePartnerName;
PopupMenu *popupMenu = nullptr;
diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp
index a7b30a20c..d2660d673 100644
--- a/src/gui/popups/skillpopup.cpp
+++ b/src/gui/popups/skillpopup.cpp
@@ -34,8 +34,6 @@
#include "debug.h"
-extern int serverVersion;
-
SkillPopup *skillPopup = nullptr;
SkillPopup::SkillPopup() :
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 2d1161d1d..7454eee73 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -54,8 +54,6 @@
#include "debug.h"
-extern int serverVersion;
-
static const BeingAction::Action actions[] =
{
BeingAction::STAND,
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 5a8931524..500f72b66 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -58,7 +58,6 @@
#include "debug.h"
SocialWindow *socialWindow = nullptr;
-extern unsigned int tmwServerVersion;
SocialWindow::SocialWindow() :
// TRANSLATORS: social window name
diff --git a/src/item.cpp b/src/item.cpp
index 01a47e0dd..ca860eeea 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -36,8 +36,6 @@
#include "debug.h"
-extern int serverVersion;
-
DragDrop dragDrop(nullptr, DRAGDROP_SOURCE_EMPTY);
Item::Item(const int id, const int quantity, const uint8_t refine,
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 000f96132..71ca80846 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -32,8 +32,6 @@
#include "debug.h"
-extern int serverVersion;
-
namespace Ea
{
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 4f347ae74..82154f6d9 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -42,9 +42,6 @@
#include "debug.h"
-extern int serverVersion;
-extern unsigned int tmwServerVersion;
-
namespace Ea
{
BeingHandler::BeingHandler(const bool enableSync) :
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index c53243dc1..b1c90ee17 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -49,8 +49,6 @@
#include "debug.h"
-extern unsigned int tmwServerVersion;
-
namespace Ea
{
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index d0017fd03..2c8c64cda 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -39,8 +39,6 @@
#include "debug.h"
-extern int serverVersion;
-
const Equipment::Slot EQUIP_POINTS[Equipment::EQUIP_VECTOREND] =
{
Equipment::EQUIP_LEGS_SLOT, // Lower Headgear
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index ccc303cdf..e2ffe196c 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -42,7 +42,6 @@
#include "debug.h"
extern Net::InventoryHandler *inventoryHandler;
-extern int serverVersion;
namespace EAthena
{
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index f39b88979..bea17edb6 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -53,9 +53,7 @@
#include "debug.h"
extern Net::BeingHandler *beingHandler;
-
extern int serverVersion;
-extern unsigned int tmwServerVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 2bb2788f6..2b34e0a83 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -39,7 +39,6 @@
#include "debug.h"
extern Net::BuySellHandler *buySellHandler;
-extern int serverVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 46e2fca13..099649566 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -43,8 +43,6 @@
#include "debug.h"
extern Net::ChatHandler *chatHandler;
-extern int serverVersion;
-extern unsigned int tmwServerVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 8947c7c32..4a7b00147 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -35,7 +35,6 @@
#include "debug.h"
extern Net::GuildHandler *guildHandler;
-extern unsigned int tmwServerVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index e99246d25..a1eb1b159 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -42,7 +42,6 @@
#include "debug.h"
extern Net::InventoryHandler *inventoryHandler;
-extern int serverVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index bfe833577..0718e9b4f 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -39,7 +39,6 @@
#include "debug.h"
extern Net::NpcHandler *npcHandler;
-extern int serverVersion;
namespace TmwAthena
{
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index ad8314d4f..62b6ab487 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -38,8 +38,6 @@ namespace
ColorDB::ColorLists mColorLists;
}
-extern int serverVersion;
-
void ColorDB::load()
{
if (mLoaded)
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 5f0b377b1..ae64ae9c1 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -57,8 +57,6 @@ namespace
std::map<std::string, ItemSoundEvent::Type> mSoundNames;
} // namespace
-extern int serverVersion;
-
// Forward declarations
static void loadSpriteRef(ItemInfo *const itemInfo,
const XmlNodePtr node);
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 7b89af145..f5b098d17 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -39,7 +39,6 @@
#include "debug.h"
SpriteReference *SpriteReference::Empty = nullptr;
-extern int serverVersion;
const Action *SpriteDef::getAction(const std::string &action,
const unsigned num) const
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 071247483..ec79a29da 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -33,8 +33,6 @@
#include "debug.h"
-extern int serverVersion;
-
ShopItem::ShopItem(const int inventoryIndex, const int id,
const unsigned char color,
const int quantity, const int price) :
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index ee1c8bfc5..79251a24b 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -39,8 +39,6 @@
#include "debug.h"
-extern unsigned int tmwServerVersion;
-
void outStringNormal(ChatTab *const tab,
const std::string &str,
const std::string &def)