From 576cf98a0798fbec9019afcd022fd4e518b53f10 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 31 Jan 2009 09:04:22 +0000 Subject: Fix some compile errors --- src/map/magic-stmt.c | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/map/magic-stmt.c b/src/map/magic-stmt.c index d9ba86e..ba132b3 100644 --- a/src/map/magic-stmt.c +++ b/src/map/magic-stmt.c @@ -100,6 +100,51 @@ free_invocation(invocation_t *invocation) // free(invocation); } +static void +char_set_weapon_icon(character_t *subject, int count, int icon, int look) +{ +// const int magic_item_inventory_index = -1; +// const int weapon_position = 4; + + // The icon isn't working at the moment. + + subject->attack_spell_icon_override = icon; + subject->attack_spell_look_override = look; + + clif_fixpcpos(subject); + if (count) { +// /* Set it to `override' */ +// clif_additem(subject, magic_item_inventory_index, count, 0, icon); + clif_changelook(&subject->bl, LOOK_WEAPON, look); +// clif_equipitemack(subject, magic_item_inventory_index, weapon_position, 1); + } else { + /* Set it to `normal' */ + clif_changelook(&subject->bl, LOOK_WEAPON, subject->status.weapon); + +// if (subject->equip_index[weapon_position] == -1) +// clif_equipitemack(subject, 0, weapon_position, 1); +// else +// clif_equipitemack(subject, subject->equip_index[weapon_position], weapon_position, 1); + } +} + +static void +char_set_attack_info(character_t *subject, int speed, int range) +{ + subject->attack_spell_delay = speed; + subject->attack_spell_range = range; + + if (speed == 0) { + pc_calcstatus(subject, 1); + clif_updatestatus(subject, SP_ASPD); + clif_updatestatus(subject, SP_ATTACKRANGE); + } else { + subject->aspd = speed; + clif_updatestatus(subject, SP_ASPD); + clif_updatestatus(subject, SP_ATTACKRANGE); + } +} + void magic_stop_completely(character_t *c) { @@ -131,51 +176,6 @@ try_to_finish_invocation(invocation_t *invocation) } } -static void -char_set_attack_info(character_t *subject, int speed, int range) -{ - subject->attack_spell_delay = speed; - subject->attack_spell_range = range; - - if (speed == 0) { - pc_calcstatus(subject, 1); - clif_updatestatus(subject, SP_ASPD); - clif_updatestatus(subject, SP_ATTACKRANGE); - } else { - subject->aspd = speed; - clif_updatestatus(subject, SP_ASPD); - clif_updatestatus(subject, SP_ATTACKRANGE); - } -} - -static void -char_set_weapon_icon(character_t *subject, int count, int icon, int look) -{ -// const int magic_item_inventory_index = -1; -// const int weapon_position = 4; - - // The icon isn't working at the moment. - - subject->attack_spell_icon_override = icon; - subject->attack_spell_look_override = look; - - clif_fixpcpos(subject); - if (count) { -// /* Set it to `override' */ -// clif_additem(subject, magic_item_inventory_index, count, 0, icon); - clif_changelook(&subject->bl, LOOK_WEAPON, look); -// clif_equipitemack(subject, magic_item_inventory_index, weapon_position, 1); - } else { - /* Set it to `normal' */ - clif_changelook(&subject->bl, LOOK_WEAPON, subject->status.weapon); - -// if (subject->equip_index[weapon_position] == -1) -// clif_equipitemack(subject, 0, weapon_position, 1); -// else -// clif_equipitemack(subject, subject->equip_index[weapon_position], weapon_position, 1); - } -} - static int trigger_spell(int subject, int spell) { -- cgit v1.2.3-60-g2f50