From a01f15e08da3b2e0e326b2a94100e17962136741 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 7 Apr 2012 14:50:36 +0200
Subject: Lua: Refactor all the corruption code into C

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2e62644..d610e193 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c
+  spells1.c spells2.c corrupt.c
   status.c files.c notes.c loadsave.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c
-- 
cgit v1.2.1


From 5ea970c82ba3119ca3a5ee68037aee7cdda6dfa3 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 7 Apr 2012 20:47:47 +0200
Subject: Lua: Moved mimicry to C

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d610e193..c2ed88a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c corrupt.c
+  spells1.c spells2.c corrupt.c mimic.c
   status.c files.c notes.c loadsave.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c
-- 
cgit v1.2.1


From 976701ed6d6a45214bc2ea9fea3f6f7299ae379c Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 8 Apr 2012 20:30:54 +0200
Subject: Lua: God quest: Move place_rand_dung() to C

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2ed88a3..a453e573 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(SRCS
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c modules.c 
+  q_god.c
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-- 
cgit v1.2.1


From c14f382bb54811eeeeef9df8d455e6b770acd795 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 9 Apr 2012 20:59:23 +0200
Subject: Lua: Remove quest.pkg

---
 src/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a453e573..f8a0b24f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ SET(SRCS
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
   # Lua bits:
   lua_bind.c script.c w_mnster.c w_player.c w_play_c.c w_z_pack.c
-  w_obj.c w_util.c w_spells.c w_quest.c w_dun.c
+  w_obj.c w_util.c w_spells.c w_dun.c
 )
 
 # Need a few additional source files for Windows.
@@ -58,7 +58,6 @@ TOLUA_FILE(z_pack w_z_pack.c)
 TOLUA_FILE(object w_obj.c)
 TOLUA_FILE(util w_util.c)
 TOLUA_FILE(spells w_spells.c)
-TOLUA_FILE(quest w_quest.c)
 TOLUA_FILE(dungeon w_dun.c)
 
 # tome executable
-- 
cgit v1.2.1


From e9e75f37fe3ca6b5702f8de49c1c2581a6719cef Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 11 Apr 2012 20:12:11 +0200
Subject: Add empty spells3.c as preparation for moving spells.

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8a0b24f..18975f17 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c corrupt.c mimic.c
+  spells1.c spells2.c spells3.c corrupt.c mimic.c
   status.c files.c notes.c loadsave.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c
-- 
cgit v1.2.1


From 7c95b69311bcbadb84fba499584fe721612ca144 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 15 May 2012 21:29:50 +0200
Subject: Lua: Move 'print_spell_desc' and 'spell_x' to C

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18975f17..b286a477 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c spells3.c corrupt.c mimic.c
+  spells1.c spells2.c spells3.c spells4.c corrupt.c mimic.c
   status.c files.c notes.c loadsave.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c
-- 
cgit v1.2.1


From c1f2b8f2d299d22be4ad3f2f176b6e106eeff6dc Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 18 May 2012 13:52:06 +0200
Subject: Lua: Move school_book[] to C

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b286a477..3a640e74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,6 +62,7 @@ TOLUA_FILE(dungeon w_dun.c)
 
 # tome executable
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lua)
 ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS})
 TARGET_LINK_LIBRARIES(tome lua ${LIBS})
-- 
cgit v1.2.1


From f7e4d1b4d9da8c42f02f79c0328477dd787fecd2 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 18 May 2012 15:07:28 +0200
Subject: Lua: Add string_list for dynamic string lists

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a640e74..f1af4895 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
   spells1.c spells2.c spells3.c spells4.c corrupt.c mimic.c
-  status.c files.c notes.c loadsave.c
+  status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c
   generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
-- 
cgit v1.2.1


From 3c6ca071045f3ab2153db833c2be2b500a43880c Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 27 May 2012 17:22:21 +0200
Subject: Lua: Add "range_type" to support moving spells.

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f1af4895..219ceb7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
   spells1.c spells2.c spells3.c spells4.c corrupt.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-  help.c
+  help.c range.c
   generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
   cmovie.c
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
-- 
cgit v1.2.1


From d98a999477698bb0a304c4995df44f2b7ef5389d Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 29 May 2012 06:25:07 +0200
Subject: Lua: Convert all the spell metadata to C code

(Yay automated translation!)
---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 219ceb7c..d1648754 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c spells3.c spells4.c corrupt.c mimic.c
+  spells1.c spells2.c spells3.c spells4.c spells5.c corrupt.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c range.c
-- 
cgit v1.2.1


From 1b9ce2b53e26ed2d983efb9da10eb2be89d6d705 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 30 May 2012 05:33:44 +0200
Subject: Lua: Migrate spell schools to C

---
 src/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1648754..d84f94ba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,8 @@ SET(SRCS
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
-  spells1.c spells2.c spells3.c spells4.c spells5.c corrupt.c mimic.c
+  spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
+  corrupt.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c range.c
-- 
cgit v1.2.1


From 7833f2577399f212be5c107611f291be1b47ce8f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 11 Jun 2012 19:06:24 +0200
Subject: Lua: Move joke monster code to C

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d84f94ba..0e1b21da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
   spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
-  corrupt.c mimic.c
+  corrupt.c joke.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
   help.c range.c
-- 
cgit v1.2.1


From 64e064330c5c595d0b8553028e0c5ca95c5e5392 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 19 Jun 2012 18:32:22 +0200
Subject: Lua: Remove Lua

---
 src/CMakeLists.txt | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e1b21da..452ca3e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Lua support code.
-ADD_SUBDIRECTORY(lua)
-
 SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
@@ -19,8 +16,7 @@ SET(SRCS
   cmovie.c
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
   # Lua bits:
-  lua_bind.c script.c w_mnster.c w_player.c w_play_c.c w_z_pack.c
-  w_obj.c w_util.c w_spells.c w_dun.c
+  lua_bind.c script.c
 )
 
 # Need a few additional source files for Windows.
@@ -41,26 +37,6 @@ if(WIN32)
 endif(WIN32)
 
 
-# Macro for defining tolua targets.
-MACRO(TOLUA_FILE MODULE_NAME OUTPUT_FILE_NAME)
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${OUTPUT_FILE_NAME}
-    COMMAND tolua -n ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.pkg
-    DEPENDS tolua ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.pkg
-    )
-  SET_SOURCE_FILES_PROPERTIES("${OUTPUT_FILE_NAME}" PROPERTIES GENERATED TRUE)
-ENDMACRO(TOLUA_FILE)
-
-# Process all the needed modules.
-TOLUA_FILE(monster w_mnster.c)
-TOLUA_FILE(player w_player.c)
-TOLUA_FILE(player_c w_play_c.c)
-TOLUA_FILE(z_pack w_z_pack.c)
-TOLUA_FILE(object w_obj.c)
-TOLUA_FILE(util w_util.c)
-TOLUA_FILE(spells w_spells.c)
-TOLUA_FILE(dungeon w_dun.c)
-
 # tome executable
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-- 
cgit v1.2.1


From 721d727a76bfe2facfc9f893f913eaf43ab4ec64 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 25 Jun 2012 06:20:51 +0200
Subject: Remove Lua references from CMakeLists.txt

---
 src/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 452ca3e2..b9d6874a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,9 +40,8 @@ endif(WIN32)
 # tome executable
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lua)
 ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS})
-TARGET_LINK_LIBRARIES(tome lua ${LIBS})
+TARGET_LINK_LIBRARIES(tome ${LIBS})
 
 # Installation
 INSTALL(TARGETS tome
-- 
cgit v1.2.1


From ae6bee5100bb9ec4e7a3d5fa8538ca3eae38dc58 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 09:04:06 +0200
Subject: messages: Move message_* functions to separate compilation unit

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b9d6874a..22563cd4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
-  melee1.c melee2.c modules.c 
+  melee1.c melee2.c messages.c modules.c
   q_god.c
   object1.c object2.c randart.c squeltch.c traps.c 
   monster1.c monster2.c monster3.c
-- 
cgit v1.2.1


From 6c3d9cd354cc69bbbc719e0be91169946e3212a0 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 17:09:57 +0200
Subject: Quarks: Move subsystem to separate compilation unit

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22563cd4..0e71e07b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(SRCS
   generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
   cmovie.c
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
+  quark.c
   # Lua bits:
   lua_bind.c script.c
 )
-- 
cgit v1.2.1


From f7e87bc98111f97ca489e1f13999058a7df8171e Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 29 Jun 2012 20:49:49 +0200
Subject: Split high score reading/writing into separate compilation unit

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e71e07b..50bb33de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   corrupt.c joke.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-  help.c range.c
+  help.c hiscore.c range.c
   generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
   cmovie.c
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
-- 
cgit v1.2.1


From 763a1c383895f5f04d025ba6ebf79aee9425df70 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 30 Jun 2012 08:51:51 +0200
Subject: Change spell_type to a semi-ADT

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50bb33de..03c1771b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(SRCS
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
   spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
+  spell_type.c
   corrupt.c joke.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-- 
cgit v1.2.1


From b05113a48a2031282b5f4e65b97407a7bc8438c1 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 19 Jun 2012 20:03:42 +0200
Subject: C++: Move Automatizer to C++

---
 src/CMakeLists.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03c1771b..7f84a2d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,17 @@
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+# Add subdirectories
+ADD_SUBDIRECTORY (squelch)
+
+# Sources
 SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c messages.c modules.c
   q_god.c
-  object1.c object2.c randart.c squeltch.c traps.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
   spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
@@ -38,12 +45,9 @@ if(WIN32)
   endif(MINGW)
 endif(WIN32)
 
-
 # tome executable
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS})
-TARGET_LINK_LIBRARIES(tome ${LIBS})
+TARGET_LINK_LIBRARIES(tome squelch ${LIBS})
 
 # Installation
 INSTALL(TARGETS tome
-- 
cgit v1.2.1


From 1014b3342b9a61a5477b06b566271b5216edbbe3 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 17:54:01 +0100
Subject: Split library quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f84a2d0..a7ae81ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c messages.c modules.c
-  q_god.c
+  q_god.c q_library.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
-- 
cgit v1.2.1


From fb0511aaa96c7a6089f39508703a8e0479b709f1 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:04:40 +0100
Subject: Split fireproofing quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7ae81ef..ea4206e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c messages.c modules.c
-  q_god.c q_library.c
+  q_god.c q_library.c q_fireprof.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
-- 
cgit v1.2.1


From ad687f1dab21fee379ccf70fbe4fc27c2e66409f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:09:59 +0100
Subject: Split bounty hunter quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea4206e1..a5316cb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c messages.c modules.c
-  q_god.c q_library.c q_fireprof.c
+  q_god.c q_library.c q_fireprof.c q_bounty.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
-- 
cgit v1.2.1


From 7ab6f5007e8a4db9f2f19fd9a88347adfc36dcd9 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:14:18 +0100
Subject: Split Thrain quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5316cb4..bd706b04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(SRCS
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   melee1.c melee2.c messages.c modules.c
-  q_god.c q_library.c q_fireprof.c q_bounty.c
+  q_god.c q_library.c q_fireprof.c q_bounty.c q_thrain.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
-- 
cgit v1.2.1


From ed1ec7f8250ae3665fbe577f4812574a9a32ab0c Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:22:25 +0100
Subject: Split Narsil quest from plots.c

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd706b04..8dc8c234 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,6 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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
   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
-- 
cgit v1.2.1


From ddd8786965ed3e020d83ec940584c6c529ab9875 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:25:59 +0100
Subject: Split Khazad-dum quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8dc8c234..2b930392 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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_narsil.c q_evil.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
-- 
cgit v1.2.1


From 1462a5fbe4ec3e4c87e489c283c6c4cbc0d5316b Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:33:52 +0100
Subject: Split "Between cities" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b930392..255531bb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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_narsil.c q_evil.c q_betwen.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
-- 
cgit v1.2.1


From cbd585203f4701e3ce9096815b76e8a14223783b Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:37:51 +0100
Subject: Split "Haunted House" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 255531bb..6f90cf63 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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_narsil.c q_evil.c q_betwen.c q_haunted.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
-- 
cgit v1.2.1


From ed23f9e34987846c22d0f679d230c225c977a19f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:40:14 +0100
Subject: Split "Invasion of Gondolin" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f90cf63..c41f3019 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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_narsil.c q_evil.c q_betwen.c q_haunted.c q_invas.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
-- 
cgit v1.2.1


From 1837ed317dc2ed3a741588f6fcb5e3bda58d3887 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:42:45 +0100
Subject: Split "Nirnaeth Arnoiedad" quest from plots.c

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c41f3019..69b57480 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +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
   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
-- 
cgit v1.2.1


From 0c07f2b07c4730762effd27955d7d13aa49dba74 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:48:47 +0100
Subject: =?UTF-8?q?Split=20E=C3=B6l=20&=20God=20quests=20from=20plots.c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69b57480..1bf537b5 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_nirna.c q_eol.c q_god.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
-- 
cgit v1.2.1


From 2542e580af280396ec1c4ce3b9f3ad76fe40d38e Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 18:52:27 +0100
Subject: Split "Dragons!" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1bf537b5..de4be38d 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_nirna.c q_eol.c q_god.c q_dragons.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
-- 
cgit v1.2.1


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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

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
-- 
cgit v1.2.1


From 1491a1fe626d1cde5541a8de284193eafd5bbed2 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:00:45 +0100
Subject: Split Spider quest from plots.c

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b607d199..15516dac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@ SET(SRCS
   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_poison.c
+  q_spider.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
-- 
cgit v1.2.1


From 60d422ca9be29752ffb7d6d3a734845c46a89e28 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:03:20 +0100
Subject: Split "Wolves!" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 15516dac..01281443 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
   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_poison.c
-  q_spider.c
+  q_spider.c q_wolves.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
-- 
cgit v1.2.1


From e4aad7f42f675137e877f2c8ca3dd8a0da2fc6aa Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:06:26 +0100
Subject: Split Mushroom quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 01281443..17a0e0a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
   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_poison.c
-  q_spider.c q_wolves.c
+  q_spider.c q_wolves.c q_shroom.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
-- 
cgit v1.2.1


From 0a7cd1758c9e5f321f8652ada9b6637b352999ec Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:08:32 +0100
Subject: Split Nazgul quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17a0e0a8..2ffa3748 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
   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_poison.c
-  q_spider.c q_wolves.c q_shroom.c
+  q_spider.c q_wolves.c q_shroom.c q_nazgul.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
-- 
cgit v1.2.1


From 2e797029ff1940b4c327b916900f4fb6004c7e69 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:11:04 +0100
Subject: Split Wight quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2ffa3748..83e75b6b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
   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_poison.c
-  q_spider.c q_wolves.c q_shroom.c q_nazgul.c
+  q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.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
-- 
cgit v1.2.1


From 4ce0078105404cc577cf74662fbc5d67b964f364 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:13:16 +0100
Subject: Split Troll quest from plots.c

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83e75b6b..ef6f04b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,7 @@ SET(SRCS
   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_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
+  q_troll.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
-- 
cgit v1.2.1


From 693aaaefe39c119490d592ed12c0a4de84d38915 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:15:41 +0100
Subject: Split Hobbit quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef6f04b6..6f0974f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(SRCS
   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_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c
+  q_troll.c q_hobbit.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
-- 
cgit v1.2.1


From 82224d3c88d07a02ec1db676d3bbb7d4b07bea0f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:20:02 +0100
Subject: Split "Thieves!" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f0974f3..f9fc4a34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(SRCS
   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_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c q_hobbit.c
+  q_troll.c q_hobbit.c q_thief.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
-- 
cgit v1.2.1


From a7abd11f574fc89620ddafa9ebac4f7fa50a1a7a Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:22:40 +0100
Subject: Split "Ultra Evil" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f9fc4a34..3aea4af5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(SRCS
   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_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c q_hobbit.c q_thief.c
+  q_troll.c q_hobbit.c q_thief.c q_ultrae.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
-- 
cgit v1.2.1


From 5478165ad9d479ca9a5135e42ba139cae15aa5e6 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:24:43 +0100
Subject: Split "Ultra Good" quest from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3aea4af5..42468279 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(SRCS
   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_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c q_hobbit.c q_thief.c q_ultrae.c
+  q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.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
-- 
cgit v1.2.1


From 410376a132361a76e79c2c079e2e0ab6650fec71 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:26:38 +0100
Subject: Split "The One" quest from plots.c

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42468279..3e08f7ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(SRCS
   q_nirna.c q_eol.c q_god.c q_dragons.c q_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
   q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.c
+  q_one.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
-- 
cgit v1.2.1


From a9c3fa61b870baab20e4ef2f8a2eaa071f8abb56 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:30:32 +0100
Subject: Split the main quests from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e08f7ec..0213a49a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(SRCS
   q_nirna.c q_eol.c q_god.c q_dragons.c q_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
   q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.c
-  q_one.c
+  q_one.c q_main.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
-- 
cgit v1.2.1


From 96f2a22e37c54c474954fc1443f4f7ffef55c468 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 24 Mar 2013 19:34:15 +0100
Subject: Split random quests from plots.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0213a49a..fcddce9d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(SRCS
   q_nirna.c q_eol.c q_god.c q_dragons.c q_poison.c
   q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
   q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.c
-  q_one.c q_main.c
+  q_one.c q_main.c q_rand.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
-- 
cgit v1.2.1


From 63bb0520dcdb6177533fe3b412fd72ee1ce6d711 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 25 Mar 2013 10:59:33 +0100
Subject: Split out data types

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcddce9d..cf0b88b2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ SET(SRCS
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
   spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
-  spell_type.c
+  spell_type.c device_allocation.c
   corrupt.c joke.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-- 
cgit v1.2.1


From 07abe10e701b6e6d5acbfc79db665e29bceeb0ab Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 25 Mar 2013 11:19:10 +0100
Subject: Split "dice" out

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cf0b88b2..74d71c68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(SRCS
   corrupt.c joke.c mimic.c
   status.c files.c notes.c loadsave.c string_list.c
   cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-  help.c hiscore.c range.c
+  help.c hiscore.c range.c dice.c
   generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
   cmovie.c
   wizard2.c init2.c birth.c wizard1.c init1.c main.c 
-- 
cgit v1.2.1


From eb657ada4c1ec432fc0e3aec0b9f4d796efed428 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 25 Mar 2013 13:10:24 +0100
Subject: Split hooks into separate header

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 74d71c68..ba0fd9d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ ADD_SUBDIRECTORY (squelch)
 SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
-  variable.c tables.c plots.c util.c cave.c dungeon.c 
+  variable.c tables.c hooks.c util.c cave.c dungeon.c
   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
-- 
cgit v1.2.1


From cbef37bd5bfb938a2303ee3887520c08be85d8e8 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Mar 2013 17:10:10 +0100
Subject: Switch almost everything over to C++

---
 src/CMakeLists.txt | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba0fd9d2..221dfa2b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,29 +8,29 @@ ADD_SUBDIRECTORY (squelch)
 SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-virt.c z-term.c
-  variable.c tables.c hooks.c util.c cave.c dungeon.c
-  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_poison.c
-  q_spider.c q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.c
-  q_one.c q_main.c q_rand.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
-  spells1.c spells2.c spells3.c spells4.c spells5.c spells6.c
-  spell_type.c device_allocation.c
-  corrupt.c joke.c mimic.c
-  status.c files.c notes.c loadsave.c string_list.c
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c
-  help.c hiscore.c range.c dice.c
-  generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c
-  cmovie.c
-  wizard2.c init2.c birth.c wizard1.c init1.c main.c 
-  quark.c
+  variable.cc tables.cc hooks.cc util.cc cave.cc dungeon.cc
+  melee1.cc melee2.cc messages.cc modules.cc
+  q_god.cc q_library.cc q_fireprof.cc q_bounty.cc q_thrain.cc
+  q_narsil.cc q_evil.cc q_betwen.cc q_haunted.cc q_invas.cc
+  q_nirna.cc q_eol.cc q_god.cc q_dragons.cc q_poison.cc
+  q_spider.cc q_wolves.cc q_shroom.cc q_nazgul.cc q_wight.cc
+  q_troll.cc q_hobbit.cc q_thief.cc q_ultrae.cc q_ultrag.cc
+  q_one.cc q_main.cc q_rand.cc
+  object1.cc object2.cc randart.cc squeltch.cc traps.cc
+  monster1.cc monster2.cc monster3.cc
+  xtra1.cc xtra2.cc skills.cc powers.cc gods.cc
+  spells1.cc spells2.cc spells3.cc spells4.cc spells5.cc spells6.cc
+  spell_type.cc device_allocation.cc
+  corrupt.cc joke.cc mimic.cc
+  status.cc files.cc notes.cc loadsave.cc string_list.cc
+  cmd1.cc cmd2.cc cmd3.cc cmd4.cc cmd5.cc cmd6.cc cmd7.cc
+  help.cc hiscore.cc range.cc dice.cc
+  generate.cc gen_maze.cc gen_evol.cc wild.cc levels.cc store.cc bldg.cc
+  cmovie.cc
+  wizard1.cc wizard2.cc init1.cc init2.cc birth.cc main.c
+  quark.cc
   # Lua bits:
-  lua_bind.c script.c
+  lua_bind.cc script.cc
 )
 
 # Need a few additional source files for Windows.
-- 
cgit v1.2.1


From 25f27454b680ae37439ef2f573988f74ebbb90e6 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 2 Jul 2014 18:55:11 +0200
Subject: Remove graphics support

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 221dfa2b..1885b2a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(SRCS
 
 # Need a few additional source files for Windows.
 if(WIN32)
-  SET(SRCS ${SRCS} main-win.c readdib.c)
+  SET(SRCS ${SRCS} main-win.c)
   # Resource files require a little workaround.
   if(MINGW)
     # Workaround for resource compilation for mingw on CMake.
-- 
cgit v1.2.1


From d9dc4907574b52afc7b5181e9813fd36da2ca201 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 13 Dec 2014 13:54:38 +0100
Subject: Inline safe_calloc() and remove z-virt.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1885b2a0..bb49ff19 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_SUBDIRECTORY (squelch)
 # Sources
 SET(SRCS
   main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
-  z-rand.c z-util.c z-form.c z-virt.c z-term.c
+  z-rand.c z-util.c z-form.c z-term.c
   variable.cc tables.cc hooks.cc util.cc cave.cc dungeon.cc
   melee1.cc melee2.cc messages.cc modules.cc
   q_god.cc q_library.cc q_fireprof.cc q_bounty.cc q_thrain.cc
-- 
cgit v1.2.1


From dc505ea036e9f2cd9ec655d142d60ea97aebbf0a Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 13 Dec 2014 13:54:38 +0100
Subject: Remove xaw frontend and inline maid-x11.c

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb49ff19..3b2c5b2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_SUBDIRECTORY (squelch)
 
 # Sources
 SET(SRCS
-  main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c
+  main-gcu.c main-x11.c main-sdl.c main-gtk2.c
   z-rand.c z-util.c z-form.c z-term.c
   variable.cc tables.cc hooks.cc util.cc cave.cc dungeon.cc
   melee1.cc melee2.cc messages.cc modules.cc
-- 
cgit v1.2.1


From 76d1d3f63fef965ba0a2d5ccea3408ad36e9ce4c Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Thu, 18 Dec 2014 00:00:35 +0100
Subject: Remove all uses of sglib

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b2c5b2f..dbe722ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ SET(SRCS
   spells1.cc spells2.cc spells3.cc spells4.cc spells5.cc spells6.cc
   spell_type.cc device_allocation.cc
   corrupt.cc joke.cc mimic.cc
-  status.cc files.cc notes.cc loadsave.cc string_list.cc
+  status.cc files.cc notes.cc loadsave.cc
   cmd1.cc cmd2.cc cmd3.cc cmd4.cc cmd5.cc cmd6.cc cmd7.cc
   help.cc hiscore.cc range.cc dice.cc
   generate.cc gen_maze.cc gen_evol.cc wild.cc levels.cc store.cc bldg.cc
-- 
cgit v1.2.1


From bc77660df705f46e55c8c733a924c5cc85dcdc48 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 21 Dec 2014 16:06:49 +0100
Subject: Remove old-style hooks code

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dbe722ad..df64bbf2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(SRCS
   q_nirna.cc q_eol.cc q_god.cc q_dragons.cc q_poison.cc
   q_spider.cc q_wolves.cc q_shroom.cc q_nazgul.cc q_wight.cc
   q_troll.cc q_hobbit.cc q_thief.cc q_ultrae.cc q_ultrag.cc
-  q_one.cc q_main.cc q_rand.cc
+  q_one.cc q_main.cc q_rand.cc quest.cc
   object1.cc object2.cc randart.cc squeltch.cc traps.cc
   monster1.cc monster2.cc monster3.cc
   xtra1.cc xtra2.cc skills.cc powers.cc gods.cc
-- 
cgit v1.2.1


From 062cd07342edc2b003555e90dd2cee0514b9f64a Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 23 Feb 2015 09:11:55 +0100
Subject: Add BanditCpp 1.1.4 test harness

---
 src/CMakeLists.txt | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df64bbf2..a834095b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,12 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/bandit)
 
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
 
-# Sources
-SET(SRCS
-  main-gcu.c main-x11.c main-sdl.c main-gtk2.c
+# Sources (common)
+SET(SRCS_COMMON
   z-rand.c z-util.c z-form.c z-term.c
   variable.cc tables.cc hooks.cc util.cc cave.cc dungeon.cc
   melee1.cc melee2.cc messages.cc modules.cc
@@ -27,12 +27,18 @@ SET(SRCS
   help.cc hiscore.cc range.cc dice.cc
   generate.cc gen_maze.cc gen_evol.cc wild.cc levels.cc store.cc bldg.cc
   cmovie.cc
-  wizard1.cc wizard2.cc init1.cc init2.cc birth.cc main.c
+  wizard1.cc wizard2.cc init1.cc init2.cc birth.cc
   quark.cc
   # Lua bits:
   lua_bind.cc script.cc
 )
 
+# Sources (PROGRAM)
+SET(SRCS_PROGRAM main-gcu.c main-x11.c main-sdl.c main-gtk2.c main.c)
+
+# Sources (TEST)
+FILE(GLOB SRCS_TESTS ../tests/**.cc)
+
 # Need a few additional source files for Windows.
 if(WIN32)
   SET(SRCS ${SRCS} main-win.c)
@@ -51,9 +57,13 @@ if(WIN32)
 endif(WIN32)
 
 # tome executable
-ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS})
+ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS_COMMON} ${SRCS_PROGRAM})
 TARGET_LINK_LIBRARIES(tome squelch ${LIBS})
 
+# test harness executable
+ADD_EXECUTABLE(harness ${EXECUTABLE_OPTIONS} ${SRCS_COMMON} ${SRCS_TESTS})
+TARGET_LINK_LIBRARIES(harness squelch ${LIBS})
+
 # Installation
 INSTALL(TARGETS tome
   RUNTIME DESTINATION bin
-- 
cgit v1.2.1


From c63c783ef4634f5715a5aafb4397c9b8bb844358 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 23 Feb 2015 09:11:56 +0100
Subject: Use explicit list of test files to avoid "forgot-to-regenerate"

---
 src/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a834095b..24074cb9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,10 @@ SET(SRCS_COMMON
 SET(SRCS_PROGRAM main-gcu.c main-x11.c main-sdl.c main-gtk2.c main.c)
 
 # Sources (TEST)
-FILE(GLOB SRCS_TESTS ../tests/**.cc)
+SET(SRCS_TESTS
+  ../tests/get_level_device.cc
+  ../tests/lua_get_level.cc
+  ../tests/harness.cc)
 
 # Need a few additional source files for Windows.
 if(WIN32)
-- 
cgit v1.2.1


From 9ea5f1e7067c8ce37a180b094a13ec5e8a576cc4 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 23 Feb 2015 09:12:00 +0100
Subject: "Inline" cmovie_clean_line in files.cc

It wasn't being used anywhere else, so we might as well
limit is definition scope.
---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24074cb9..9573fe7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ SET(SRCS_COMMON
   cmd1.cc cmd2.cc cmd3.cc cmd4.cc cmd5.cc cmd6.cc cmd7.cc
   help.cc hiscore.cc range.cc dice.cc
   generate.cc gen_maze.cc gen_evol.cc wild.cc levels.cc store.cc bldg.cc
-  cmovie.cc
   wizard1.cc wizard2.cc init1.cc init2.cc birth.cc
   quark.cc
   # Lua bits:
-- 
cgit v1.2.1


From 72ceb4f2aba3b86be43ba9a7cb5c576b79920543 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 7 Mar 2015 16:55:41 +0100
Subject: Split option variables into separate header and source file

Remove unused

  testing_stack
  testing_carry

options while we're at it.
---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9573fe7d..346677b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(SRCS_COMMON
   xtra1.cc xtra2.cc skills.cc powers.cc gods.cc
   spells1.cc spells2.cc spells3.cc spells4.cc spells5.cc spells6.cc
   spell_type.cc device_allocation.cc
-  corrupt.cc joke.cc mimic.cc
+  corrupt.cc joke.cc mimic.cc options.cc
   status.cc files.cc notes.cc loadsave.cc
   cmd1.cc cmd2.cc cmd3.cc cmd4.cc cmd5.cc cmd6.cc cmd7.cc
   help.cc hiscore.cc range.cc dice.cc
-- 
cgit v1.2.1


From 8b2be5adc24ffdecc7bb5d8ed08be12a7590bc46 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 15 Apr 2015 19:12:41 +0200
Subject: Rework object list filters to avoid global variables

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 346677b7..06257593 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(SRCS_COMMON
   q_troll.cc q_hobbit.cc q_thief.cc q_ultrae.cc q_ultrag.cc
   q_one.cc q_main.cc q_rand.cc quest.cc
   object1.cc object2.cc randart.cc squeltch.cc traps.cc
+  object_filter.cc
   monster1.cc monster2.cc monster3.cc
   xtra1.cc xtra2.cc skills.cc powers.cc gods.cc
   spells1.cc spells2.cc spells3.cc spells4.cc spells5.cc spells6.cc
-- 
cgit v1.2.1


From 99ff3d574bac23f4fe6fe3c65a89c46cb3fe6003 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sun, 7 Jun 2015 17:49:09 +0200
Subject: Use a single line per file in source lists

---
 src/CMakeLists.txt | 130 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 24 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06257593..9221e109 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,40 +7,122 @@ ADD_SUBDIRECTORY (squelch)
 
 # Sources (common)
 SET(SRCS_COMMON
-  z-rand.c z-util.c z-form.c z-term.c
-  variable.cc tables.cc hooks.cc util.cc cave.cc dungeon.cc
-  melee1.cc melee2.cc messages.cc modules.cc
-  q_god.cc q_library.cc q_fireprof.cc q_bounty.cc q_thrain.cc
-  q_narsil.cc q_evil.cc q_betwen.cc q_haunted.cc q_invas.cc
-  q_nirna.cc q_eol.cc q_god.cc q_dragons.cc q_poison.cc
-  q_spider.cc q_wolves.cc q_shroom.cc q_nazgul.cc q_wight.cc
-  q_troll.cc q_hobbit.cc q_thief.cc q_ultrae.cc q_ultrag.cc
-  q_one.cc q_main.cc q_rand.cc quest.cc
-  object1.cc object2.cc randart.cc squeltch.cc traps.cc
+  birth.cc
+  bldg.cc
+  cave.cc
+  cmd1.cc
+  cmd2.cc
+  cmd3.cc
+  cmd4.cc
+  cmd5.cc
+  cmd6.cc
+  cmd7.cc
+  corrupt.cc
+  device_allocation.cc
+  dice.cc
+  dungeon.cc
+  files.cc
+  gen_evol.cc
+  gen_maze.cc
+  generate.cc
+  gods.cc
+  help.cc
+  hiscore.cc
+  hooks.cc
+  init1.cc
+  init2.cc
+  joke.cc
+  levels.cc
+  loadsave.cc
+  lua_bind.cc
+  melee1.cc
+  melee2.cc
+  messages.cc
+  mimic.cc
+  modules.cc
+  monster1.cc
+  monster2.cc
+  monster3.cc
+  notes.cc
+  object1.cc
+  object2.cc
   object_filter.cc
-  monster1.cc monster2.cc monster3.cc
-  xtra1.cc xtra2.cc skills.cc powers.cc gods.cc
-  spells1.cc spells2.cc spells3.cc spells4.cc spells5.cc spells6.cc
-  spell_type.cc device_allocation.cc
-  corrupt.cc joke.cc mimic.cc options.cc
-  status.cc files.cc notes.cc loadsave.cc
-  cmd1.cc cmd2.cc cmd3.cc cmd4.cc cmd5.cc cmd6.cc cmd7.cc
-  help.cc hiscore.cc range.cc dice.cc
-  generate.cc gen_maze.cc gen_evol.cc wild.cc levels.cc store.cc bldg.cc
-  wizard1.cc wizard2.cc init1.cc init2.cc birth.cc
+  options.cc
+  powers.cc
+  q_betwen.cc
+  q_bounty.cc
+  q_dragons.cc
+  q_eol.cc
+  q_evil.cc
+  q_fireprof.cc
+  q_god.cc
+  q_god.cc
+  q_haunted.cc
+  q_hobbit.cc
+  q_invas.cc
+  q_library.cc
+  q_main.cc
+  q_narsil.cc
+  q_nazgul.cc
+  q_nirna.cc
+  q_one.cc
+  q_poison.cc
+  q_rand.cc
+  q_shroom.cc
+  q_spider.cc
+  q_thief.cc
+  q_thrain.cc
+  q_troll.cc
+  q_ultrae.cc
+  q_ultrag.cc
+  q_wight.cc
+  q_wolves.cc
   quark.cc
-  # Lua bits:
-  lua_bind.cc script.cc
+  quest.cc
+  randart.cc
+  range.cc
+  script.cc
+  skills.cc
+  spell_type.cc
+  spells1.cc
+  spells2.cc
+  spells3.cc
+  spells4.cc
+  spells5.cc
+  spells6.cc
+  squeltch.cc
+  status.cc
+  store.cc
+  tables.cc
+  traps.cc
+  util.cc
+  variable.cc
+  wild.cc
+  wizard1.cc
+  wizard2.cc
+  xtra1.cc
+  xtra2.cc
+  z-form.c
+  z-rand.c
+  z-term.c
+  z-util.c
 )
 
 # Sources (PROGRAM)
-SET(SRCS_PROGRAM main-gcu.c main-x11.c main-sdl.c main-gtk2.c main.c)
+SET(SRCS_PROGRAM
+  main-gcu.c
+  main-gtk2.c
+  main-sdl.c
+  main-x11.c
+  main.c
+)
 
 # Sources (TEST)
 SET(SRCS_TESTS
   ../tests/get_level_device.cc
+  ../tests/harness.cc
   ../tests/lua_get_level.cc
-  ../tests/harness.cc)
+)
 
 # Need a few additional source files for Windows.
 if(WIN32)
-- 
cgit v1.2.1


From ed6d65fa84a5e40ef89fea96e3c795b35a95e44e Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 8 Jun 2015 07:19:47 +0200
Subject: Use compile-to-library trick to reduce compilation time

Before we would be compiling most of the game engine
code twice because of the test harness.

In my totally non-rigorous benchmark this reduced the compilation time
rather drastically from ~162s to ~96s. (Using a single CPU for
compilation.)
---
 src/CMakeLists.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9221e109..dcd1e518 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -124,6 +124,10 @@ SET(SRCS_TESTS
   ../tests/lua_get_level.cc
 )
 
+ADD_LIBRARY(game
+  ${SRCS_COMMON}
+)
+
 # Need a few additional source files for Windows.
 if(WIN32)
   SET(SRCS ${SRCS} main-win.c)
@@ -142,12 +146,12 @@ if(WIN32)
 endif(WIN32)
 
 # tome executable
-ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS_COMMON} ${SRCS_PROGRAM})
-TARGET_LINK_LIBRARIES(tome squelch ${LIBS})
+ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS_PROGRAM})
+TARGET_LINK_LIBRARIES(tome game squelch ${LIBS})
 
 # test harness executable
-ADD_EXECUTABLE(harness ${EXECUTABLE_OPTIONS} ${SRCS_COMMON} ${SRCS_TESTS})
-TARGET_LINK_LIBRARIES(harness squelch ${LIBS})
+ADD_EXECUTABLE(harness ${EXECUTABLE_OPTIONS} ${SRCS_TESTS})
+TARGET_LINK_LIBRARIES(harness game squelch ${LIBS})
 
 # Installation
 INSTALL(TARGETS tome
-- 
cgit v1.2.1


From 00be445e9127922933dae91a3d68660a57f53c5b Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 11 Dec 2015 08:09:30 +0100
Subject: Refactor race_info_idx() to avoid "invisible" static pointers

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dcd1e518..1fc6a3b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ SET(SRCS_COMMON
   messages.cc
   mimic.cc
   modules.cc
+  monster_type.cc
   monster1.cc
   monster2.cc
   monster3.cc
-- 
cgit v1.2.1


From 97bcf1bc612d9920390c885b8dcea0b0cda6f246 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 11 Dec 2015 08:09:30 +0100
Subject: Migrate z-rand.c to C++

- Include explicitly instead of via angband.h
- Change to regular functions instead of macros.
---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fc6a3b4..942946fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,7 @@ SET(SRCS_COMMON
   xtra1.cc
   xtra2.cc
   z-form.c
-  z-rand.c
+  z-rand.cc
   z-term.c
   z-util.c
 )
-- 
cgit v1.2.1


From c8bd25efe980a6455fef1f6622fe5c69d1ed7a4d Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 5 Feb 2016 19:22:46 +0100
Subject: Inline init_lua_init()

---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 942946fc..9919485d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,6 @@ SET(SRCS_COMMON
   quest.cc
   randart.cc
   range.cc
-  script.cc
   skills.cc
   spell_type.cc
   spells1.cc
-- 
cgit v1.2.1


From e5bb0921ef06a98b77b3e91d9b2f77caaa1f89a9 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 5 Feb 2016 19:22:46 +0100
Subject: Build: Produce multiple independent executables

---
 src/CMakeLists.txt | 64 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 23 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9919485d..c984db61 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,15 +108,6 @@ SET(SRCS_COMMON
   z-util.c
 )
 
-# Sources (PROGRAM)
-SET(SRCS_PROGRAM
-  main-gcu.c
-  main-gtk2.c
-  main-sdl.c
-  main-x11.c
-  main.c
-)
-
 # Sources (TEST)
 SET(SRCS_TESTS
   ../tests/get_level_device.cc
@@ -128,11 +119,14 @@ ADD_LIBRARY(game
   ${SRCS_COMMON}
 )
 
+ADD_LIBRARY(game_main
+  main.cc)
+
 # Need a few additional source files for Windows.
-if(WIN32)
+IF(WIN32)
   SET(SRCS ${SRCS} main-win.c)
   # Resource files require a little workaround.
-  if(MINGW)
+  IF(MINGW)
     # Workaround for resource compilation for mingw on CMake.
     # See http://www.cmake.org/Bug/view.php?id=4068
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/angband_rc.o
@@ -140,20 +134,44 @@ if(WIN32)
                                            -i${CMAKE_CURRENT_SOURCE_DIR}/angband.rc
                                            -o ${CMAKE_CURRENT_BINARY_DIR}/angband_rc.o)
     SET(SRCS ${SRCS} ${CMAKE_CURRENT_BINARY_DIR}/angband_rc.o)
-  else(MINGW)
+  ELSE(MINGW)
     SET(SRCS ${SRCS} angband.rc)
-  endif(MINGW)
-endif(WIN32)
+  ENDIF(MINGW)
+  # Executable for Win32
+  ADD_EXECUTABLE(tome-win WIN32 main-win.c)
+  TARGET_LINK_LIBRARIES(tome-win game squelch ${LIBS} winmm wsock32)
+  INSTALL(TARGETS tome-win RUNTIME DESTINATION bin)
+ENDIF(WIN32)
+
+# tome executables
+IF(X11_FOUND)
+  INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+  ADD_EXECUTABLE(tome-x11 main-x11.c)
+  TARGET_LINK_LIBRARIES(tome-x11 game game_main squelch ${LIBS} ${X11_LIBRARIES})
+  INSTALL(TARGETS tome-x11 RUNTIME DESTINATION bin)
+ENDIF()
 
-# tome executable
-ADD_EXECUTABLE(tome ${EXECUTABLE_OPTIONS} ${SRCS_PROGRAM})
-TARGET_LINK_LIBRARIES(tome game squelch ${LIBS})
+IF(SDL_FOUND AND SDLIMAGE_FOUND AND SDLTTF_FOUND)
+  INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR})
+  ADD_EXECUTABLE(tome-sdl main-sdl.c)
+  TARGET_LINK_LIBRARIES(tome-sdl game game_main squelch ${LIBS} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_LIBRARY} m)
+  INSTALL(TARGETS tome-sdl RUNTIME DESTINATION bin)
+ENDIF()
+
+IF(CURSES_FOUND)
+  INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
+  ADD_EXECUTABLE(tome-gcu main-gcu.c)
+  TARGET_LINK_LIBRARIES(tome-gcu game game_main squelch ${LIBS} ${CURSES_LIBRARIES})
+  INSTALL(TARGETS tome-gcu RUNTIME DESTINATION bin)
+ENDIF()
+
+IF(GTK2_FOUND)
+  INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
+  ADD_EXECUTABLE(tome-gtk2 main-gtk2.c)
+  TARGET_LINK_LIBRARIES(tome-gtk2 game game_main squelch ${LIBS} ${GTK2_LIBRARIES})
+  INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION bin)
+ENDIF()
 
 # test harness executable
-ADD_EXECUTABLE(harness ${EXECUTABLE_OPTIONS} ${SRCS_TESTS})
+ADD_EXECUTABLE(harness ${SRCS_TESTS})
 TARGET_LINK_LIBRARIES(harness game squelch ${LIBS})
-
-# Installation
-INSTALL(TARGETS tome
-  RUNTIME DESTINATION bin
-)
-- 
cgit v1.2.1


From a5a638ff7b08802ad615b689c74d697fafe4d863 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Fri, 5 Feb 2016 19:22:46 +0100
Subject: Add cppformat-2.0.0 vendor library

- Include only the necessary format.{cc,h} files to save space.
---
 src/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c984db61..6d942dfe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,15 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/bandit)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/cppformat)
 
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
 
+# Sources (vendor)
+SET(SRCS_VENDOR
+  ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/cppformat/format.cc)
+
 # Sources (common)
 SET(SRCS_COMMON
   birth.cc
@@ -116,7 +121,7 @@ SET(SRCS_TESTS
 )
 
 ADD_LIBRARY(game
-  ${SRCS_COMMON}
+  ${SRCS_COMMON} ${SRCS_VENDOR}
 )
 
 ADD_LIBRARY(game_main
-- 
cgit v1.2.1


From c8df88d8c61197d8f019efa0ba373ed14a28d914 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 29 Mar 2016 20:32:55 +0200
Subject: Introduce new way of handling flags

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d942dfe..a68e056b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,6 +118,7 @@ SET(SRCS_TESTS
   ../tests/get_level_device.cc
   ../tests/harness.cc
   ../tests/lua_get_level.cc
+  ../tests/flag_set.cc
 )
 
 ADD_LIBRARY(game
-- 
cgit v1.2.1


From 59b5314b6b7880cfda73f34aed03a700fd523017 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 20 Jun 2016 22:49:05 +0200
Subject: Rework RF{4,5,6}_* monster spell flags to flag_set<>

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a68e056b..5a4b326f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(SRCS_COMMON
   messages.cc
   mimic.cc
   modules.cc
+  monster_spell.cc
   monster_type.cc
   monster1.cc
   monster2.cc
-- 
cgit v1.2.1


From 5271c4676c2489766eb54db0fc53a7b471bed8ad Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 20 Jun 2016 22:49:05 +0200
Subject: Remove debug-only 'show all stats' code

---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5a4b326f..6ce7dffa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -97,7 +97,6 @@ SET(SRCS_COMMON
   spells5.cc
   spells6.cc
   squeltch.cc
-  status.cc
   store.cc
   tables.cc
   traps.cc
-- 
cgit v1.2.1


From 201bae59fda1a477c4e55fd1d85f2c09937ab948 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 20 Jun 2016 22:49:05 +0200
Subject: Remove wizard1.cc

It seems an awful lot of cruddy almost-duplicate code with
functionality that's a) almost never used, and b) has absolutely *no*
game impact whatsoever. So: Away it goes.
---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ce7dffa..d0e34707 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,6 @@ SET(SRCS_COMMON
   util.cc
   variable.cc
   wild.cc
-  wizard1.cc
   wizard2.cc
   xtra1.cc
   xtra2.cc
-- 
cgit v1.2.1


From 073ad3584fbf781ce10bef61ad4ff38850282f47 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 21 Jun 2016 13:37:02 +0200
Subject: Rework TR{1,2,3,4,5}_* flags to flag_set<>

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d0e34707..e3dd63fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,6 +54,7 @@ SET(SRCS_COMMON
   object1.cc
   object2.cc
   object_filter.cc
+  object_flag_meta.cc
   options.cc
   powers.cc
   q_betwen.cc
-- 
cgit v1.2.1


From f673763cfaf90c81db4af495aa06b6fc7906ddd9 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Bump cppformat -> fmt-3.0.0

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e3dd63fb..0cce20be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/bandit)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/cppformat)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/fmt)
 
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
-- 
cgit v1.2.1


From 6d11bb4a2d5bc8ab7c1491639f1083532b1b8fd1 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Replace RNG with PCG random number generator

---
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cce20be..7b4d025b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/bandit)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/fmt)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/pcg-cpp/include)
 
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
@@ -105,6 +106,7 @@ SET(SRCS_COMMON
   variable.cc
   wild.cc
   wizard2.cc
+  seed.cc
   xtra1.cc
   xtra2.cc
   z-form.c
-- 
cgit v1.2.1


From cc857c940cfe1bfe8d78674dbce53e5b71acaf41 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Move ability_type::acquired to p_ptr struct

This is justified by the fact that the 'acquired' flag is actually a
player-centered bit of information and must be
loaded/saved. Everything else in ability_type is defined by the *.txt
files.
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b4d025b..8ac5e097 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,6 +57,7 @@ SET(SRCS_COMMON
   object_filter.cc
   object_flag_meta.cc
   options.cc
+  player_type.cc
   powers.cc
   q_betwen.cc
   q_bounty.cc
-- 
cgit v1.2.1


From 288c3d3f725eabfee06507966a0ba63bf587c3da Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Remove quark.{cc,hpp}

---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ac5e097..8991318d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,7 +87,6 @@ SET(SRCS_COMMON
   q_ultrag.cc
   q_wight.cc
   q_wolves.cc
-  quark.cc
   quest.cc
   randart.cc
   range.cc
-- 
cgit v1.2.1


From 0a48c0f1af4b35338d2360f6efa4c467ec60b60d Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:15 +0200
Subject: Refactor messages.cc to use boost::circular_buffer

We might as well delegate the massive implementation
complexity and get rid of a ton of legacy code.
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8991318d..7d64a66f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,6 +43,7 @@ SET(SRCS_COMMON
   lua_bind.cc
   melee1.cc
   melee2.cc
+  message.cc
   messages.cc
   mimic.cc
   modules.cc
-- 
cgit v1.2.1


From eea082ffd1a3ecf73b7c464cc28da5ef74d3a30f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:15 +0200
Subject: Add grid<> template class for representing 2D grids

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d64a66f..bf970c59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -122,6 +122,7 @@ SET(SRCS_TESTS
   ../tests/harness.cc
   ../tests/lua_get_level.cc
   ../tests/flag_set.cc
+  ../tests/grid.cc
 )
 
 ADD_LIBRARY(game
-- 
cgit v1.2.1


From 5eec61dd05577623c1d5b9eed3a22d1352dcd990 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:15 +0200
Subject: Introduce Game struct

Motivation: SIOF is such a huge chore to work around at this point
that it's probably best to just start the looong task of getting rid
of the globals.

Currently we allocate a single global Game instance which we leak. The
idea here is to start moving global game state into the single global
Game singleton and eventually allocating the Game variable on the
stack such that everything works out nicely wrt. freeing allocated
memory and such.

Once all the game state has been moved into Game we can start plumbing
all the functions, classes, &c such that we don't have to reference
game state via the "game" global.
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf970c59..5f06bcec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(SRCS_COMMON
   dice.cc
   dungeon.cc
   files.cc
+  game.cc
   gen_evol.cc
   gen_maze.cc
   generate.cc
-- 
cgit v1.2.1


From 0f36ab53cbac06b61d1b4b6509590759ed8c6703 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 5 Oct 2016 18:45:08 +0200
Subject: Introduce jsoncons as replacement for jansson

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f06bcec..035c42d1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/bandit)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/fmt)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/pcg-cpp/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/jsoncons)
 
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
-- 
cgit v1.2.1


From cbafbc638c2e1d5bb40ee6bc419007062e9615e4 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 5 Oct 2016 18:45:09 +0200
Subject: Remove traps

Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most
of the actual work. I just did a few minor tweaks and fixes + rebased
onto master.
---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 035c42d1..3b8189b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,6 @@ SET(SRCS_COMMON
   squeltch.cc
   store.cc
   tables.cc
-  traps.cc
   util.cc
   variable.cc
   wild.cc
-- 
cgit v1.2.1


From ed08d82d76665f84d5fd9ce4ef41e84542b010cc Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 4 Jan 2017 21:26:49 +0100
Subject: Remove obsolete 'cppformat' vendor code

---
 src/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b8189b5..1900ac72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,10 +8,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/jsoncons)
 # Add subdirectories
 ADD_SUBDIRECTORY (squelch)
 
-# Sources (vendor)
-SET(SRCS_VENDOR
-  ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/cppformat/format.cc)
-
 # Sources (common)
 SET(SRCS_COMMON
   birth.cc
-- 
cgit v1.2.1


From f89759714a9332f7250054a3a0db7fae4fe1952f Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 14 Jan 2017 13:28:37 +0100
Subject: Fix link order

---
 src/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1900ac72..4967e826 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,28 +154,28 @@ ENDIF(WIN32)
 IF(X11_FOUND)
   INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
   ADD_EXECUTABLE(tome-x11 main-x11.c)
-  TARGET_LINK_LIBRARIES(tome-x11 game game_main squelch ${LIBS} ${X11_LIBRARIES})
+  TARGET_LINK_LIBRARIES(tome-x11 game_main game squelch ${LIBS} ${X11_LIBRARIES})
   INSTALL(TARGETS tome-x11 RUNTIME DESTINATION bin)
 ENDIF()
 
 IF(SDL_FOUND AND SDLIMAGE_FOUND AND SDLTTF_FOUND)
   INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR})
   ADD_EXECUTABLE(tome-sdl main-sdl.c)
-  TARGET_LINK_LIBRARIES(tome-sdl game game_main squelch ${LIBS} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_LIBRARY} m)
+  TARGET_LINK_LIBRARIES(tome-sdl game_main game squelch ${LIBS} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_LIBRARY} m)
   INSTALL(TARGETS tome-sdl RUNTIME DESTINATION bin)
 ENDIF()
 
 IF(CURSES_FOUND)
   INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
   ADD_EXECUTABLE(tome-gcu main-gcu.c)
-  TARGET_LINK_LIBRARIES(tome-gcu game game_main squelch ${LIBS} ${CURSES_LIBRARIES})
+  TARGET_LINK_LIBRARIES(tome-gcu game_main game squelch ${LIBS} ${CURSES_LIBRARIES})
   INSTALL(TARGETS tome-gcu RUNTIME DESTINATION bin)
 ENDIF()
 
 IF(GTK2_FOUND)
   INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
   ADD_EXECUTABLE(tome-gtk2 main-gtk2.c)
-  TARGET_LINK_LIBRARIES(tome-gtk2 game game_main squelch ${LIBS} ${GTK2_LIBRARIES})
+  TARGET_LINK_LIBRARIES(tome-gtk2 game_main game squelch ${LIBS} ${GTK2_LIBRARIES})
   INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION bin)
 ENDIF()
 
-- 
cgit v1.2.1


From 39e1689130e87732cf410aaea7458dfdc399d50e Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Thu, 7 Sep 2017 12:53:57 +0200
Subject: Move special_level[] to Game struct

Refactor into a multi_array<> to make it more robust.
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4967e826..30ceb76c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,6 +36,7 @@ SET(SRCS_COMMON
   init1.cc
   init2.cc
   joke.cc
+  level_marker.cc
   levels.cc
   loadsave.cc
   lua_bind.cc
-- 
cgit v1.2.1