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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/school_type.hpp b/src/school_type.hpp
index 7a5702b4..5386969d 100644
--- a/src/school_type.hpp
+++ b/src/school_type.hpp
@@ -1,21 +1,21 @@
 #pragma once
 
-#include "h-basic.h"
+#include "h-basic.hpp"
 #include "deity_type_fwd.hpp"
 
 struct school_type
 {
-	cptr name;                      /* Name */
+	const char *name;               /* Name */
 	s16b skill;                     /* Skill used for that school */
-	bool_ spell_power;              /* Does spell power affect spells in this school? */
-	bool_ sorcery;                  /* Does Sorcery affect this school? */
+	bool spell_power;              /* Does spell power affect spells in this school? */
+	bool sorcery;                  /* Does Sorcery affect this school? */
 
 	int deity_idx;     /* Deity; if <=0, no deity required */
 	deity_type *deity; /* Direct pointer to deity */
 
 	int (*bonus_levels)(); /* Calculate number of bonus levels */
 
-	bool_ (*depends_satisfied)(); /* Are dependendies satisfied? */
+	bool (*depends_satisfied)(); /* Are dependendies satisfied? */
 
 	struct school_provider_list *providers; /* List of secondary providers of this school */
 };