From c99c89cdde0b37fab35f6abe2ccf9169c6133cef Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:11:59 +0100 Subject: Move squeltch.cc function declarations to new include file --- src/cmd3.cc | 1 + src/cmd4.cc | 1 + src/dungeon.cc | 1 + src/externs.h | 9 --------- src/init2.cc | 1 + src/object1.cc | 1 + src/spells1.cc | 1 + src/squeltch.cc | 6 +----- src/squeltch.hpp | 12 ++++++++++++ 9 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 src/squeltch.hpp (limited to 'src') diff --git a/src/cmd3.cc b/src/cmd3.cc index 13623874..130032bd 100644 --- a/src/cmd3.cc +++ b/src/cmd3.cc @@ -15,6 +15,7 @@ #include "gods.hpp" #include "hooks.h" #include "quark.h" +#include "squeltch.hpp" #include #include diff --git a/src/cmd4.cc b/src/cmd4.cc index a93a48c0..f51c17b2 100644 --- a/src/cmd4.cc +++ b/src/cmd4.cc @@ -11,6 +11,7 @@ #include "hooks.h" #include "messages.h" #include "skills.hpp" +#include "squeltch.hpp" #include #include diff --git a/src/dungeon.cc b/src/dungeon.cc index 2a01db9a..81ac68be 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -20,6 +20,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells5.hpp" +#include "squeltch.hpp" #include diff --git a/src/externs.h b/src/externs.h index 3ff7d4f4..a3b8f93b 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1536,15 +1536,6 @@ extern void output_note(char *final_note); extern void add_note(char *note, char code); extern void add_note_type(int note_number); -/* squeltch.c */ -extern void squeltch_inventory(void); -extern void squeltch_grid(void); -extern void do_cmd_automatizer(void); -extern void automatizer_add_rule(object_type *o_ptr, bool_ destroy); -extern bool_ automatizer_create; -extern void automatizer_init(); -extern void automatizer_load(cptr file_name); - /* * Hack -- conditional (or "bizarre") externs diff --git a/src/init2.cc b/src/init2.cc index 92d13d4b..2796d398 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -9,6 +9,7 @@ #include "hooks.h" #include "tome/make_array.hpp" #include "spells3.hpp" +#include "squeltch.hpp" #include #include diff --git a/src/object1.cc b/src/object1.cc index b5344638..90917459 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -18,6 +18,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells5.hpp" +#include "squeltch.hpp" #include diff --git a/src/spells1.cc b/src/spells1.cc index f2d8c456..995c42c5 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -15,6 +15,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells5.hpp" +#include "squeltch.hpp" #include #include diff --git a/src/squeltch.cc b/src/squeltch.cc index 2689cdaa..1ff2c721 100644 --- a/src/squeltch.cc +++ b/src/squeltch.cc @@ -1,7 +1,3 @@ -/* File: squeltch.c */ - -/* Purpose: Automatizer */ - /* * Copyright (c) 2002 DarkGod * Copyright (c) 2012 Bardur Arantsson @@ -11,7 +7,7 @@ * included in all such copies. */ -#include "angband.h" +#include "squeltch.hpp" #include #include diff --git a/src/squeltch.hpp b/src/squeltch.hpp new file mode 100644 index 00000000..14f5d14d --- /dev/null +++ b/src/squeltch.hpp @@ -0,0 +1,12 @@ +#pragma once + +#include "angband.h" + +extern void squeltch_inventory(void); +extern void squeltch_grid(void); +extern void do_cmd_automatizer(void); +extern void automatizer_add_rule(object_type *o_ptr, bool_ destroy); +extern bool_ automatizer_create; +extern void automatizer_init(); +extern void automatizer_load(cptr file_name); + -- cgit v1.2.3