summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-17 02:05:52 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-17 02:05:52 +0100
commit45c3f943b42423dbe162bfac4a57cad013ba0630 (patch)
tree0bb0caaa15af42f1d2c3bc14061202aacf9bee6d /src/net
parentfe153c7b2598262281477882a2ef82400b24f5b5 (diff)
downloadmana-45c3f943b42423dbe162bfac4a57cad013ba0630.tar.gz
mana-45c3f943b42423dbe162bfac4a57cad013ba0630.tar.bz2
mana-45c3f943b42423dbe162bfac4a57cad013ba0630.tar.xz
mana-45c3f943b42423dbe162bfac4a57cad013ba0630.zip
Simplified the get/setAttackRange() functions as requested.
The attack range is still hardcoded for Manaserv as long as generic equipment handling hasn't been implemented.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/manaserv/gamehandler.cpp3
-rw-r--r--src/net/tmwa/inventoryhandler.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 040a5e6c..63f84fd1 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -141,7 +141,8 @@ void GameHandler::gameLoading()
chatHandler->connect();
// Attack range from item DB
- player_node->setAttackRange(-1);
+ // TODO: Deharcode it through equipment handling
+ player_node->setAttackRange(48);
}
} // namespace ManaServ
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 8ec97a38..88c72ed6 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -416,7 +416,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
{
mEquips.setEquipment(getSlot(equipType), -1);
// Reset the attack range to unarmed.
- player_node->setAttackRange(-1);
+ player_node->setAttackRange(ATTACK_RANGE_NOT_SET);
}
break;
@@ -433,7 +433,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
{
logger->log("Couldn't set attacke range due to the lack"
"of an initialized map.");
- player_node->setAttackRange(-1);
+ player_node->setAttackRange(ATTACK_RANGE_NOT_SET);
}
}
break;