summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-11-07 11:47:24 -0700
committerJared Adams <jaxad0127@gmail.com>2009-11-07 11:47:24 -0700
commit99be9859a30e84e758ee3bfe7dcc3de33dfa2391 (patch)
tree49354012582a4c9e9218ebafad429b07b19b2539 /src/localplayer.cpp
parent9c1cc1e46fd21ec48809fbb8f64853fcecef2439 (diff)
downloadmana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.gz
mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.bz2
mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.xz
mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.zip
More eAthena guild stuff
Also some related chenges elsewhere
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r--src/localplayer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index e736a01c..d670b3b6 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -102,11 +102,13 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map):
mWalkingDir(0),
mPathSetByMouse(false),
mDestX(0), mDestY(0),
- mInventory(new Inventory(Net::getInventoryHandler()->getInventorySize())),
+ mInventory(new Inventory(Net::getInventoryHandler()
+ ->getSize(Net::InventoryHandler::INVENTORY))),
#ifdef MANASERV_SUPPORT
mLocalWalkTime(-1),
#endif
- mStorage(new Inventory(Net::getInventoryHandler()->getStorageSize())),
+ mStorage(new Inventory(Net::getInventoryHandler()
+ ->getSize(Net::InventoryHandler::STORAGE))),
mMessageTime(0)
{
// Variable to keep the local player from doing certain actions before a map
@@ -350,8 +352,6 @@ void LocalPlayer::nextStep(unsigned char dir = 0)
#endif
}
-
-#ifdef MANASERV_SUPPORT
bool LocalPlayer::checkInviteRights(const std::string &guildName)
{
Guild *guild = getGuild(guildName);
@@ -389,6 +389,7 @@ void LocalPlayer::clearInventory()
mInventory->clear();
}
+#ifdef MANASERV_SUPPORT
void LocalPlayer::setInvItem(int index, int id, int amount)
{
bool equipment = false;
@@ -397,7 +398,6 @@ void LocalPlayer::setInvItem(int index, int id, int amount)
equipment = true;
mInventory->setItem(index, id, amount, equipment);
}
-
#endif
void LocalPlayer::pickUp(FloorItem *item)