diff options
Diffstat (limited to 'src/map/magic.hpp')
| -rw-r--r-- | src/map/magic.hpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/map/magic.hpp b/src/map/magic.hpp index 168a05f..4b567ea 100644 --- a/src/map/magic.hpp +++ b/src/map/magic.hpp @@ -1,8 +1,7 @@ #ifndef MAGIC_HPP #define MAGIC_HPP -#include "clif.hpp" -#include "intif.hpp" +#include "skill.t.hpp" #define MAGIC_CONFIG_FILE "conf/magic.conf" @@ -22,69 +21,68 @@ struct invocation; /* Spell invocation */ * \return 1 or -1 if the input message was magic and was handled by this function, 0 otherwise. -1 is returned when the * message should not be repeated. */ -int magic_message (character_t * caster, char *spell, size_t spell_len); +int magic_message(character_t *caster, char *spell, size_t spell_len); /** * Removes the shroud from a character * * \param character The character to remove the shroud from */ -void magic_unshroud (character_t * character); +void magic_unshroud(character_t *character); /** * Notifies a running spell that a status_change timer triggered by the spell has expired * * \param invocation The invocation to notify * \param bl_id ID of the PC for whom this happened - * \param type sc_id ID of the status change entry that finished + * \param sc_id ID of the status change entry that finished * \param supplanted Whether the status_change finished normally (0) or was supplanted by a new status_change (1) */ -void -spell_effect_report_termination (int invocation, int bl_id, int sc_id, - int supplanted); +void spell_effect_report_termination(int invocation, int bl_id, + StatusChange sc_id, int supplanted); /** * Initialise all spells, read config data */ -void do_init_magic (void); +void do_init_magic(void); /** * Identifies the invocation used to trigger a spell * * Returns NULL if not found */ -const char *magic_find_invocation (const char *spellame); +const char *magic_find_invocation(const char *spellame); /** * Identifies the invocation used to denote a teleport location * * Returns NULL if not found */ -const char *magic_find_anchor_invocation (const char *teleport_location); +const char *magic_find_anchor_invocation(const char *teleport_location); /** * Execute a spell invocation and sets up timers to finish */ -void spell_execute (struct invocation *invocation); +void spell_execute(struct invocation *invocation); /** * Continue an NPC script embedded in a spell */ -void spell_execute_script (struct invocation *invocation); +void spell_execute_script(struct invocation *invocation); /** * Stops all magic bound to the specified character * */ -void magic_stop_completely (character_t * c); +void magic_stop_completely(character_t *c); /** * Attacks with a magical spell charged to the character * * Returns 0 if there is no charged spell or the spell is depleted. */ -int spell_attack (int caster, int target); +int spell_attack(int caster, int target); -void spell_free_invocation (struct invocation *invocation); +void spell_free_invocation(struct invocation *invocation); -#endif /* !defined(MAGIC_H_) */ +#endif // MAGIC_HPP |