From 93257ccd9617dbc37784076d54c80c915722397d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 2 Mar 2012 03:47:43 +0300
Subject: Fix compilation with manaserv.
---
src/net/manaserv/attributes.cpp | 8 ++++----
src/net/manaserv/inventoryhandler.cpp | 4 ++--
src/net/manaserv/inventoryhandler.h | 4 ++--
src/net/manaserv/itemhandler.cpp | 6 +++---
src/net/manaserv/loginhandler.cpp | 1 +
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp
index c032b6bb8..662032e29 100644
--- a/src/net/manaserv/attributes.cpp
+++ b/src/net/manaserv/attributes.cpp
@@ -73,16 +73,16 @@ namespace Attributes
static unsigned int attributeMinimum = 0;
static unsigned int attributeMaximum = 0;
- unsigned int getCreationPoints() const
+ unsigned int getCreationPoints()
{ return creationPoints; }
- unsigned int getAttributeMinimum() const
+ unsigned int getAttributeMinimum()
{ return attributeMinimum; }
- unsigned int getAttributeMaximum() const
+ unsigned int getAttributeMaximum()
{ return attributeMaximum; }
- std::vector<std::string>& getLabels() const
+ std::vector<std::string>& getLabels()
{ return attributeLabels; }
/**
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 47f149eca..2c9c84c76 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -192,8 +192,8 @@ void InventoryHandler::closeStorage(int type A_UNUSED)
// TODO
}
-void InventoryHandler::moveItem(int source A_UNUSED, int slot A_UNUSED,
- int amount A_UNUSED, int destination A_UNUSED)
+void InventoryHandler::moveItem2(int source A_UNUSED, int slot A_UNUSED,
+ int amount A_UNUSED, int destination A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index 8471b1caf..af340399e 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -88,8 +88,8 @@ class InventoryHandler : public MessageHandler, Net::InventoryHandler
void closeStorage(int type);
- void moveItem(int source, int slot, int amount,
- int destination);
+ void moveItem2(int source, int slot, int amount,
+ int destination);
size_t getSize(int type) const;
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index 021d57cf3..8ebe965ec 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -66,9 +66,9 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
if (Map *map = game->getCurrentMap())
{
actorSpriteManager->createItem(id, itemId,
- x / map->getTileWidth(),
- y / map->getTileHeight(),
- 0, 1);
+ x / map->getTileWidth(),
+ y / map->getTileHeight(),
+ 0, 1, 0, 0);
}
else
{
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index f1c597c00..f93d8e44c 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -33,6 +33,7 @@
#include "net/manaserv/protocol.h"
#include "utils/gettext.h"
+#include "utils/paths.h"
#include "utils/sha256.h"
extern Net::LoginHandler *loginHandler;
--
cgit v1.2.3-70-g09d2