summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/birth.cc1
-rw-r--r--src/cmd1.cc5
-rw-r--r--src/cmd2.cc1
-rw-r--r--src/cmd3.cc3
-rw-r--r--src/dungeon.cc4
-rw-r--r--src/externs.h9
-rw-r--r--src/gods.cc6
-rw-r--r--src/gods.hpp11
-rw-r--r--src/init1.cc5
-rw-r--r--src/monster3.cc5
-rw-r--r--src/q_one.cc2
-rw-r--r--src/q_spider.cc2
-rw-r--r--src/skills.cc1
-rw-r--r--src/spells1.cc1
-rw-r--r--src/spells4.cc1
-rw-r--r--src/spells6.cc6
-rw-r--r--src/traps.cc5
-rw-r--r--src/xtra1.cc1
-rw-r--r--src/xtra2.cc1
19 files changed, 35 insertions, 35 deletions
diff --git a/src/birth.cc b/src/birth.cc
index 73cc9a37..63bf92ef 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -12,6 +12,7 @@
#include "angband.h"
#include "corrupt.hpp"
+#include "gods.hpp"
#include "messages.h"
#include "modules.hpp"
#include "hooks.h"
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 0d65b69a..1f13baec 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -1,7 +1,3 @@
-/* File: cmd1.c */
-
-/* Purpose: Movement commands (part 1) */
-
/*
* Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
*
@@ -11,6 +7,7 @@
*/
#include "angband.h"
+#include "gods.hpp"
#include "hooks.h"
#include "mimic.hpp"
#include "quark.h"
diff --git a/src/cmd2.cc b/src/cmd2.cc
index aa98533a..0e56bd58 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -11,6 +11,7 @@
*/
#include "angband.h"
+#include "gods.hpp"
#include "hooks.h"
#include "spells3.hpp"
diff --git a/src/cmd3.cc b/src/cmd3.cc
index cd924365..13623874 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -12,8 +12,9 @@
#include "angband.h"
-#include "quark.h"
+#include "gods.hpp"
#include "hooks.h"
+#include "quark.h"
#include <cassert>
#include <algorithm>
diff --git a/src/dungeon.cc b/src/dungeon.cc
index bb9c05ed..cadc4595 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -11,12 +11,12 @@
*/
#include "angband.h"
-
#include "corrupt.hpp"
+#include "gods.hpp"
+#include "hooks.h"
#include "modules.hpp"
#include "quest.h"
#include "quark.h"
-#include "hooks.h"
#include "spell_type.hpp"
#include "spells5.hpp"
diff --git a/src/externs.h b/src/externs.h
index edcc30d6..3ad761f6 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1632,12 +1632,3 @@ extern void do_cmd_ability(void);
extern bool_ has_ability(int ab);
extern void apply_level_abilities(int level);
extern void recalc_skills(bool_ init);
-
-/* gods.c */
-extern void inc_piety(int god, s32b amt);
-extern void abandon_god(int god);
-extern int wisdom_scale(int max);
-extern int find_god(cptr name);
-extern void follow_god(int god, bool_ silent);
-extern bool_ god_enabled(struct deity_type *deity);
-extern deity_type *god_at(byte god_idx);
diff --git a/src/gods.cc b/src/gods.cc
index 9fdbfeb5..92861d79 100644
--- a/src/gods.cc
+++ b/src/gods.cc
@@ -1,7 +1,3 @@
-/* File: gods.c */
-
-/* Purpose: Deities code */
-
/*
* Copyright (c) 2002 DarkGod
*
@@ -9,7 +5,7 @@
* not for profit purposes provided that this copyright and statement are
* included in all such copies.
*/
-
+#include "gods.hpp"
#include "angband.h"
#include <cassert>
diff --git a/src/gods.hpp b/src/gods.hpp
new file mode 100644
index 00000000..ba28f722
--- /dev/null
+++ b/src/gods.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "angband.h"
+
+extern void inc_piety(int god, s32b amt);
+extern void abandon_god(int god);
+extern int wisdom_scale(int max);
+extern int find_god(cptr name);
+extern void follow_god(int god, bool_ silent);
+extern bool_ god_enabled(struct deity_type *deity);
+extern deity_type *god_at(byte god_idx);
diff --git a/src/init1.cc b/src/init1.cc
index be294cce..d975bd24 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -1,8 +1,5 @@
-/* File: init1.c */
-
-/* Purpose: Initialization (part 1) -BEN- */
-
#include "angband.h"
+#include "gods.hpp"
#include <boost/algorithm/string/predicate.hpp>
diff --git a/src/monster3.cc b/src/monster3.cc
index c4e45d39..f5c6a6fb 100644
--- a/src/monster3.cc
+++ b/src/monster3.cc
@@ -1,7 +1,3 @@
-/* File: monster3.c */
-
-/* Purpose: Monsters AI */
-
/*
* Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
*
@@ -11,6 +7,7 @@
*/
#include "angband.h"
+#include "gods.hpp"
/*
* Is the mon,ster in friendly state(pet, friend, ..)
diff --git a/src/q_one.cc b/src/q_one.cc
index c36086df..1aab348b 100644
--- a/src/q_one.cc
+++ b/src/q_one.cc
@@ -1,4 +1,6 @@
#include "q_one.h"
+
+#include "gods.hpp"
#include "hooks.h"
#define cquest (quest[QUEST_ONE])
diff --git a/src/q_spider.cc b/src/q_spider.cc
index 97e2693a..63f21fe0 100644
--- a/src/q_spider.cc
+++ b/src/q_spider.cc
@@ -1,4 +1,6 @@
#include "q_spider.h"
+
+#include "gods.hpp"
#include "hooks.h"
#define cquest (quest[QUEST_SPIDER])
diff --git a/src/skills.cc b/src/skills.cc
index a31b3fcd..31897a94 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -12,6 +12,7 @@
#include "angband.h"
+#include "gods.hpp"
#include "hooks.h"
#include "util.hpp"
diff --git a/src/spells1.cc b/src/spells1.cc
index c2f5394b..809675f8 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -11,6 +11,7 @@
*/
#include "angband.h"
+#include "gods.hpp"
#include "spell_type.hpp"
#include "spells5.hpp"
diff --git a/src/spells4.cc b/src/spells4.cc
index b9ebc02c..c0e3e9af 100644
--- a/src/spells4.cc
+++ b/src/spells4.cc
@@ -3,6 +3,7 @@
#include <assert.h>
#include <sstream>
+#include "gods.hpp"
#include "lua_bind.hpp"
#include "spell_type.hpp"
#include "spell_idx_list.hpp"
diff --git a/src/spells6.cc b/src/spells6.cc
index 9a059874..a6c72791 100644
--- a/src/spells6.cc
+++ b/src/spells6.cc
@@ -1,7 +1,9 @@
-#include <angband.h>
-#include <assert.h>
+#include "angband.h"
+
+#include "gods.hpp"
#include "spell_type.hpp"
+#include <cassert>
#include <vector>
#include <type_traits>
diff --git a/src/traps.cc b/src/traps.cc
index 6b56de16..5540576d 100644
--- a/src/traps.cc
+++ b/src/traps.cc
@@ -1,7 +1,3 @@
-/* File: traps.c */
-
-/* Purpose: handle traps */
-
/* the below copyright probably still applies, but it is heavily changed
* copied, adapted & re-engineered by JK.
* Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
@@ -12,6 +8,7 @@
*/
#include "angband.h"
+#include "gods.hpp"
bool_ do_player_trap_call_out(void)
{
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 7bce7e8c..0d53a79f 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -12,6 +12,7 @@
#include "angband.h"
#include "corrupt.hpp"
+#include "gods.hpp"
#include "messages.h"
#include "hooks.h"
#include "spells3.hpp"
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 675864ca..93cbfe0f 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -13,6 +13,7 @@
#include "angband.h"
#include "corrupt.hpp"
+#include "gods.hpp"
#include "hooks.h"
#include "mimic.hpp"
#include "quark.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 23:12:16 +0000