summaryrefslogtreecommitdiff
path: root/src/squelch
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-06-07 17:49:09 +0200
committerBardur Arantsson <bardur@scientician.net>2015-06-07 17:49:09 +0200
commitc8a270e51dc22f39ed048ab1cc609e6e456df58f (patch)
tree6d6a7d2338abdbecbb1351e2c9cbf9b08b42b6bc /src/squelch
parentdcb193fabc7af4776bdf0d31045f6801fa18000e (diff)
Split types.h into separate header for each type
Diffstat (limited to 'src/squelch')
-rw-r--r--src/squelch/automatizer.cc2
-rw-r--r--src/squelch/condition.cc22
-rw-r--r--src/squelch/condition_metadata.cc2
-rw-r--r--src/squelch/object_status.cc9
-rw-r--r--src/squelch/rule.cc1
-rw-r--r--src/squelch/tree_printer.cc2
6 files changed, 23 insertions, 15 deletions
diff --git a/src/squelch/automatizer.cc b/src/squelch/automatizer.cc
index 0ea04dae..c3c52b1b 100644
--- a/src/squelch/automatizer.cc
+++ b/src/squelch/automatizer.cc
@@ -4,8 +4,8 @@
#include "tome/squelch/rule.hpp"
#include "tome/squelch/cursor.hpp"
#include "tome/squelch/tree_printer.hpp"
-#include "angband.h"
#include "util.hpp"
+#include "z-term.h"
namespace squelch {
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index fdc777d3..00243450 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -5,14 +5,20 @@
#include "tome/squelch/cursor.hpp"
#include "tome/squelch/tree_printer.hpp"
-#include "ability_type.hpp"
-#include "angband.h"
-#include "object1.hpp"
-#include "object2.hpp"
-#include "skills.hpp"
-#include "quark.hpp"
-#include "util.hpp"
-#include "variable.hpp"
+#include "../ability_type.hpp"
+#include "../object1.hpp"
+#include "../object2.hpp"
+#include "../object_kind.hpp"
+#include "../object_type.hpp"
+#include "../player_race.hpp"
+#include "../player_race_mod.hpp"
+#include "../player_spec.hpp"
+#include "../player_type.hpp"
+#include "../skills.hpp"
+#include "../skill_type.hpp"
+#include "../quark.hpp"
+#include "../util.hpp"
+#include "../variable.hpp"
namespace squelch {
diff --git a/src/squelch/condition_metadata.cc b/src/squelch/condition_metadata.cc
index 187f833f..62a90e58 100644
--- a/src/squelch/condition_metadata.cc
+++ b/src/squelch/condition_metadata.cc
@@ -4,11 +4,11 @@
#include <vector>
#include "tome/squelch/object_status.hpp"
-#include "angband.h"
#include "lua_bind.hpp"
#include "skills.hpp"
#include "util.hpp"
#include "util.h"
+#include "z-term.h"
namespace squelch {
diff --git a/src/squelch/object_status.cc b/src/squelch/object_status.cc
index d0293c41..075c0529 100644
--- a/src/squelch/object_status.cc
+++ b/src/squelch/object_status.cc
@@ -1,10 +1,11 @@
#include "tome/squelch/object_status_fwd.hpp"
#include "tome/squelch/object_status.hpp"
-#include "angband.h"
-#include "object1.hpp"
-#include "object2.hpp"
-#include "variable.hpp"
+#include "../inventory.hpp"
+#include "../object1.hpp"
+#include "../object2.hpp"
+#include "../object_type.hpp"
+#include "../variable.hpp"
namespace squelch {
diff --git a/src/squelch/rule.cc b/src/squelch/rule.cc
index 44c110cb..1c17d2fd 100644
--- a/src/squelch/rule.cc
+++ b/src/squelch/rule.cc
@@ -8,6 +8,7 @@
#include "../modules.hpp"
#include "../object1.hpp"
#include "../object2.hpp"
+#include "../object_type.hpp"
#include "../quark.hpp"
#include "../tables.hpp"
#include "../util.hpp"
diff --git a/src/squelch/tree_printer.cc b/src/squelch/tree_printer.cc
index 812933a9..2be098dc 100644
--- a/src/squelch/tree_printer.cc
+++ b/src/squelch/tree_printer.cc
@@ -1,7 +1,7 @@
#include "tome/squelch/tree_printer_fwd.hpp"
#include "tome/squelch/tree_printer.hpp"
-#include "angband.h"
+#include "../z-term.h"
namespace squelch {