New upstream version 2.41-ah~0.git.20200131

1 files changed, 15 insertions, 13 deletions

diff --git a/src/monster3.hpp b/src/monster3.hpp
index ac26b102..23f707ee 100644
--- a/src/monster3.hpp
+++ b/src/monster3.hpp
@@ -1,20 +1,22 @@
 #pragma once
 
-#include "h-basic.h"
+#include "h-basic.hpp"
 #include "monster_type_fwd.hpp"
 
+#include <cstdio>
+
 void dump_companions(FILE *outfile);
 void do_cmd_companion();
-bool_ do_control_reconnect();
-bool_ do_control_drop();
-bool_ do_control_magic();
-bool_ do_control_pickup();
-bool_ do_control_inven();
-bool_ do_control_walk();
-bool_ can_create_companion();
+bool do_control_reconnect();
+bool do_control_drop();
+bool do_control_magic();
+bool do_control_pickup();
+bool do_control_inven();
+bool do_control_walk();
+bool can_create_companion();
 void ai_deincarnate(int m_idx);
-bool_ ai_possessor(int m_idx, int o_idx);
-bool_ ai_multiply(int m_idx);
-bool_ change_side(monster_type *m_ptr);
-int is_friend(monster_type *m_ptr);
-bool_ is_enemy(monster_type *m_ptr, monster_type *t_ptr);
+void ai_possessor(int m_idx, int o_idx);
+bool ai_multiply(int m_idx);
+bool change_side(monster_type *m_ptr);
+int is_friend(const monster_type *m_ptr);
+bool is_enemy(monster_type *m_ptr, monster_type *t_ptr);