From d055bee5e6b45737ab89b3f8c70c6d0db7a22eb3 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Mon, 24 Jan 2011 22:10:02 +0100 Subject: Refactored the item loading in a more extensible and per protocol way. This will greatly help into upgrading the need of each protocol separately. This is the first step to a new item and equipment system for manaserv. A subclassing of the EquipmentWindow will be done in the next commit, as requested by Thorbjorn. Reviewed-by: Thorbjorn. --- src/localplayer.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/localplayer.cpp') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 7d427b82..81fb1cee 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1020,12 +1020,16 @@ int LocalPlayer::getAttackRange() } else { - // TODO: Fix this to be more generic - Item *weapon = PlayerInfo::getEquipment(EQUIP_FIGHT1_SLOT); - if (weapon) + if (Net::getNetworkType() == ServerInfo::TMWATHENA) { - const ItemInfo info = weapon->getInfo(); - return info.getAttackRange(); + // TODO: Fix this to be more generic + Item *weapon = PlayerInfo::getEquipment( + TmwAthena::EQUIP_FIGHT1_SLOT); + if (weapon) + { + const ItemInfo info = weapon->getInfo(); + return info.getAttackRange(); + } } return 48; // unarmed range } -- cgit v1.2.3-70-g09d2