- Fixed standing up not really standing you up.

- Moved battle_consume_ammo to the end of skill_castend_damage_id, skill_castend_nodamage_id and skill_castend_pos2 rather than battle_calc_weapon_attack. They will trigger when the player's arrow_atk state is active and a ground skill was not invoked. It should fix all issues with splash/ground skills consuming ammo per target rather than once per skill use.
- Added structure state to the ground skills, their fields are magic_power, into_abyss and ammo_consume to indicate the states that were previously stored in val3.
- Corrected Desperado ammo consumption (should be 10)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6455 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 0 deletions

diff --git a/src/map/map.h b/src/map/map.h
index c06252b46..59307c071 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -356,6 +356,11 @@ struct skill_unit_group {
 	int group_id;

 	int unit_count,alive_count;

 	struct skill_unit *unit;

+	struct {

+		unsigned ammo_consume : 1;

+		unsigned magic_power : 1;

+		unsigned into_abyss : 1;

+	} state;

 };

 struct skill_unit_group_tickset {

 	unsigned int tick;