From d20b79683997990a1b46ac8d4117f9195aa278f2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 2 Apr 2009 14:54:43 +0200 Subject: Some cleanup and renaming * Removed superfluous 'virtual' keyword in *Handler implementations * Renamed NPCHandler to NpcHandler * Renamed InvyHandler to InventoryHandler * Made all *Handler interface methods pure virtual * Used forward declarations in net.h * Renamed {start,end}Shoping to {start,end}Shopping --- src/localplayer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/localplayer.cpp') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 7dc9ec43..a154e6a0 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -353,11 +353,11 @@ void LocalPlayer::moveInvItem(Item *item, int newIndex) void LocalPlayer::equipItem(Item *item) { - // Net::getInvyHandler()->equipItem(item); + // Net::getInventoryHandler()->equipItem(item); #ifdef TMWSERV_SUPPORT Net::GameServer::Player::equip(item->getInvIndex()); #else - invyHandler->equipItem(item); + inventoryHandler->equipItem(item); #endif } @@ -375,11 +375,11 @@ void LocalPlayer::unequipItem(int slot) void LocalPlayer::unequipItem(Item *item) { - // Net::getInvyHandler()->unequipItem(item); + // Net::getInventoryHandler()->unequipItem(item); #ifdef TMWSERV_SUPPORT Net::GameServer::Player::unequip(item->getInvIndex()); #else - invyHandler->unequipItem(item); + inventoryHandler->unequipItem(item); #endif // Tidy equipment directly to avoid weapon still shown bug, for instance @@ -390,21 +390,21 @@ void LocalPlayer::unequipItem(Item *item) void LocalPlayer::useItem(Item *item) { - // Net::getInvyHandler()->useItem(item); + // Net::getInventoryHandler()->useItem(item); #ifdef TMWSERV_SUPPORT Net::GameServer::Player::useItem(item->getInvIndex()); #else - invyHandler->useItem(item); + inventoryHandler->useItem(item); #endif } void LocalPlayer::dropItem(Item *item, int quantity) { - // Net::getInvyHandler()->dropItem(item, quantity); + // Net::getInventoryHandler()->dropItem(item, quantity); #ifdef TMWSERV_SUPPORT Net::GameServer::Player::drop(item->getInvIndex(), quantity); #else - invyHandler->dropItem(item, quantity); + inventoryHandler->dropItem(item, quantity); #endif } -- cgit v1.2.3-60-g2f50