From e69588809fa4ce2cae244decaac3ebd0762f258a Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:54:48 +0100
Subject: Split "Poisoned Water" quest from plots.c

---
 src/CMakeLists.txt |  2 +-
 src/plots.c        |  1 -
 src/plots.h        |  1 -
 src/q_poison.c     |  5 ++++-
 src/q_poison.h     | 13 +++++++++++++
 src/tables.c       |  1 +
 6 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 src/q_poison.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de4be38d..b607d199 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(SRCS
   melee1.c melee2.c messages.c modules.c
   q_god.c q_library.c q_fireprof.c q_bounty.c q_thrain.c
   q_narsil.c q_evil.c q_betwen.c q_haunted.c q_invas.c
-  q_nirna.c q_eol.c q_god.c q_dragons.c
+  q_nirna.c q_eol.c q_god.c q_dragons.c q_poison.c
   object1.c object2.c randart.c squeltch.cc traps.c
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
diff --git a/src/plots.c b/src/plots.c
index b78d9362..2072a391 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -380,4 +380,3 @@ bool_ quest_null_hook(int q)
 /*************************** Lorien plot **************************/
 #include "q_wolves.c"
 #include "q_spider.c"
-#include "q_poison.c"
diff --git a/src/plots.h b/src/plots.h
index 56c2a61b..51db424d 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -28,4 +28,3 @@ extern bool_ quest_shroom_init_hook(int q_idx);
 /******* Plot Lorien *********/
 extern bool_ quest_wolves_init_hook(int q_idx);
 extern bool_ quest_spider_init_hook(int q_idx);
-extern bool_ quest_poison_init_hook(int q_idx);
diff --git a/src/q_poison.c b/src/q_poison.c
index 0c3987df..152b7d59 100644
--- a/src/q_poison.c
+++ b/src/q_poison.c
@@ -1,4 +1,7 @@
-#undef cquest
+#include "q_poison.h"
+#include "quark.h"
+#include "messages.h"
+
 #define cquest (quest[QUEST_POISON])
 
 static int wild_locs[4][2] =
diff --git a/src/q_poison.h b/src/q_poison.h
new file mode 100644
index 00000000..73fcd0e5
--- /dev/null
+++ b/src/q_poison.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_poison_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index 160594d7..6553490d 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -24,6 +24,7 @@
 #include "q_eol.h"
 #include "q_god.h"
 #include "q_dragons.h"
+#include "q_poison.h"
 
 
 
-- 
cgit v1.2.3