summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/skill.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 626e0d350..6612e3f44 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/09/24
+ * When the code auto-guesses that a skill should require ammo, it will
+ accept any type of ammo for using it instead of only arrows. Fixes Magnum
+ Break usage on Gunslingers. [Skotlex]
2006/09/22
* Probably fixed a signed/unsigned mismatch warning on the new socket code.
[Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index 2003b89a5..5a484ff0b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7898,7 +7898,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
if (!ammo && skill && skill_isammotype(sd, skill))
{ //Assume this skill is using the weapon, therefore it requires arrows.
- ammo = 2; //1<<1 <- look 1 (arrows) moved right 1 times.
+ ammo = 0xFFFFFFFF; //Enable use on all ammo types.
ammo_qty = skill_get_num(skill, lv);
if (ammo_qty < 0) ammo_qty *= -1;
}