From 37cea853947851134b2e6f2e338d85ddc5378616 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:12:01 +0100 Subject: Split spells6.cc declarations to separate header file --- src/externs.h | 7 ------- src/script.cc | 1 + src/spells4.cc | 1 + src/spells6.cc | 3 ++- src/spells6.hpp | 7 +++++++ src/xtra1.cc | 1 + 6 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 src/spells6.hpp diff --git a/src/externs.h b/src/externs.h index f85cffb8..12da39c1 100644 --- a/src/externs.h +++ b/src/externs.h @@ -760,13 +760,6 @@ extern s16b m_bonus(int max, int level); extern void object_gain_level(object_type *o_ptr); extern s32b flag_cost(object_type * o_ptr, int plusses); -/* spells6.c */ - -void schools_init(); -school_type *school_at(int index); - -void mana_school_calc_mana(int *msp); - /* util.c */ extern s32b rescale(s32b x, s32b max, s32b new_max); extern bool_ input_box(cptr text, int y, int x, char *buf, int max); diff --git a/src/script.cc b/src/script.cc index 3e3ce8a3..1c1cab68 100644 --- a/src/script.cc +++ b/src/script.cc @@ -14,6 +14,7 @@ #include "q_library.h" #include "spells4.hpp" #include "spells5.hpp" +#include "spells6.hpp" void init_lua_init() diff --git a/src/spells4.cc b/src/spells4.cc index 9e389d8e..4198ead5 100644 --- a/src/spells4.cc +++ b/src/spells4.cc @@ -8,6 +8,7 @@ #include "spell_idx_list.hpp" #include "spells3.hpp" #include "spells5.hpp" +#include "spells6.hpp" #include #include diff --git a/src/spells6.cc b/src/spells6.cc index 5c2d2a67..c97a1b42 100644 --- a/src/spells6.cc +++ b/src/spells6.cc @@ -1,5 +1,6 @@ -#include "angband.h" +#include "spells6.hpp" +#include "angband.h" #include "gods.hpp" #include "skills.hpp" #include "spell_type.hpp" diff --git a/src/spells6.hpp b/src/spells6.hpp new file mode 100644 index 00000000..ef5f4e30 --- /dev/null +++ b/src/spells6.hpp @@ -0,0 +1,7 @@ +#pragma once + +#include "angband.h" + +void schools_init(); +school_type *school_at(int index); +void mana_school_calc_mana(int *msp); diff --git a/src/xtra1.cc b/src/xtra1.cc index b23b06d1..25dd90a3 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -18,6 +18,7 @@ #include "mimic.hpp" #include "skills.hpp" #include "spells3.hpp" +#include "spells6.hpp" #include "xtra2.hpp" #include -- cgit v1.2.3