Cleanup headers and remove all uses of va_list except logging

1 files changed, 18 insertions, 21 deletions

diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp
index 2414a7a..664c818 100644
--- a/src/map/magic-interpreter.hpp
+++ b/src/map/magic-interpreter.hpp
@@ -1,14 +1,14 @@
-/* Magic interpreter */
-
 #ifndef MAGIC_INTERPRETER_HPP
 #define MAGIC_INTERPRETER_HPP
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "../common/nullpo.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
 
 #include "battle.hpp"
 #include "chat.hpp"
@@ -20,16 +20,13 @@
 #include "map.hpp"
 #include "mob.hpp"
 #include "npc.hpp"
-#include "pc.hpp"
 #include "party.hpp"
+#include "pc.hpp"
 #include "script.hpp"
 #include "skill.hpp"
 #include "storage.hpp"
 #include "trade.hpp"
 
-#include "../common/timer.hpp"
-#include "../common/socket.hpp"
-
 #define SPELLARG_NONE   0       /* No spell parameter */
 #define SPELLARG_PC     1           /* Spell parameter describes pc (defaults to self) */
 #define SPELLARG_STRING 2       /* Spell parameter describes pc (defaults to self) */
@@ -454,31 +451,31 @@ teleport_anchor_t *magic_find_anchor(char *name);
 /**
  * The parameter `param' must have been dynamically allocated; ownership is transferred to the resultant env_t.
  */
-env_t *spell_create_env(magic_conf_t * conf, spell_t * spell,
-                         character_t * caster, int spellpower, char *param);
+env_t *spell_create_env(magic_conf_t *conf, spell_t *spell,
+                         character_t *caster, int spellpower, char *param);
 
-void magic_free_env(env_t * env);
+void magic_free_env(env_t *env);
 
 /**
  * near_miss is set to nonzero iff the spell only failed due to ephemereal issues (spell delay in effect, out of mana, out of components)
  */
-effect_set_t *spell_trigger(spell_t * spell, character_t * caster,
-                             env_t * env, int *near_miss);
+effect_set_t *spell_trigger(spell_t *spell, character_t *caster,
+                             env_t *env, int *near_miss);
 
-invocation_t *spell_instantiate(effect_set_t * effect, env_t * env);
+invocation_t *spell_instantiate(effect_set_t *effect, env_t *env);
 
 /**
  * Bind a spell to a subject (this is a no-op for `local' spells).
  */
-void spell_bind(character_t * subject, invocation_t * invocation);
+void spell_bind(character_t *subject, invocation_t *invocation);
 
 int                            // 1 on failure
-     spell_unbind(character_t * subject, invocation_t * invocation);
+     spell_unbind(character_t *subject, invocation_t *invocation);
 
 /**
  * Clones a spell to run the at_effect field
  */
-invocation_t *spell_clone_effect(invocation_t * source);
+invocation_t *spell_clone_effect(invocation_t *source);
 
 spell_t *magic_find_spell(char *invocation);
 
@@ -499,6 +496,6 @@ typedef struct
 
 // must be called after itemdb initialisation
 int magic_init(const char *);
-void spell_update_location(invocation_t * invocation);
+void spell_update_location(invocation_t *invocation);
 
-#endif /* !defined (MAGIC_INTERPRETER_H) */
+#endif // MAGIC_INTERPRETER_HPP