From 1ee0e5c7b0cc469a2d10a7a83b638409a206dee9 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Thu, 29 Jun 2017 08:49:12 -0700
Subject: [PATCH] Finish newdb -> dungeon renaming.

---
 .gitignore   |  8 +++-----
 Makefile     | 34 +++++++++++++++++-----------------
 actions.c    |  2 +-
 advent.h     |  2 +-
 cheat.c      |  2 +-
 main.c       |  2 +-
 misc.c       |  2 +-
 saveresume.c |  2 +-
 score.c      |  2 +-
 9 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index a99743d..ddb549b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,15 @@
 advent
-dungeon
 *.gcda
 *.gcno
 *.o
 *.html
-database.h
+dungeon.h
+dungeon.c
 advent.6
 *.tar.gz
 MANIFEST
 *.adv
 .*~
-newdb.h
-newdb.c
 cheat
 advent.info
-coverage/*
\ No newline at end of file
+coverage/*
diff --git a/Makefile b/Makefile
index d16b12b..758408a 100644
--- a/Makefile
+++ b/Makefile
@@ -38,40 +38,40 @@ endif
 
 OBJS=main.o init.o actions.o score.o misc.o saveresume.o
 CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
-SOURCES=$(OBJS:.o=.c) advent.h adventure.text adventure.yaml Makefile control linenoise/linenoise.[ch] newdungeon.py
+SOURCES=$(OBJS:.o=.c) advent.h adventure.text adventure.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) linenoise.o newdb.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
+advent:	$(OBJS) linenoise.o dungeon.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h newdb.h
+main.o:	 	advent.h dungeon.h
 
-init.o:	 	advent.h newdb.h
+init.o:	 	advent.h dungeon.h
 
-actions.o:	advent.h newdb.h
+actions.o:	advent.h dungeon.h
 
-score.o:	advent.h newdb.h
+score.o:	advent.h dungeon.h
 
-misc.o:		advent.h newdb.h
+misc.o:		advent.h dungeon.h
 
-cheat.o:	advent.h newdb.h
+cheat.o:	advent.h dungeon.h
 
-saveresume.o:	advent.h newdb.h
+saveresume.o:	advent.h dungeon.h
 
-newdb.o:	newdb.c newdb.h
-	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
+dungeon.o:	dungeon.c dungeon.h
+	$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-newdb.c newdb.h: newdungeon.py adventure.yaml
-	python3 newdungeon.py
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+	python3 make_dungeon.py
 
 linenoise.o:	linenoise/linenoise.h
 	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean:
 	rm -f *.o advent cheat *.html *.gcno *.gcda
-	rm -f newdb.c newdb.h
+	rm -f dungeon.c dungeon.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	rm -f .*~
@@ -79,8 +79,8 @@ clean:
 	cd tests; $(MAKE) --quiet clean
 
 
-cheat: $(CHEAT_OBJS) linenoise.o newdb.o 
-	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o newdb.o $(LDFLAGS) $(LIBS)
+cheat: $(CHEAT_OBJS) linenoise.o dungeon.o 
+	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o dungeon.o $(LDFLAGS) $(LIBS)
 
 check: advent cheat
 	cd tests; $(MAKE) --quiet
diff --git a/actions.c b/actions.c
index f746dee..e01d2cf 100644
--- a/actions.c
+++ b/actions.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "advent.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 static int fill(token_t, token_t);
 
diff --git a/advent.h b/advent.h
index 7846e8f..3cd2e23 100644
--- a/advent.h
+++ b/advent.h
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
-#include "newdb.h"
+#include "dungeon.h"
 
 #define LINESIZE	100
 #define NDWARVES	6		/* number of dwarves */
diff --git a/cheat.c b/cheat.c
index 858a916..d9da405 100644
--- a/cheat.c
+++ b/cheat.c
@@ -6,7 +6,7 @@
 #include <time.h>
 #include "advent.h"
 #include "linenoise/linenoise.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 struct game_t game;
 
diff --git a/main.c b/main.c
index c5dc311..c197057 100644
--- a/main.c
+++ b/main.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "advent.h"
 #include "linenoise/linenoise.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 #define DIM(a) (sizeof(a)/sizeof(a[0]))
 
diff --git a/misc.c b/misc.c
index 4e3aeb3..ae43668 100644
--- a/misc.c
+++ b/misc.c
@@ -8,7 +8,7 @@
 
 #include "advent.h"
 #include "linenoise/linenoise.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 const char new_advent_to_ascii[] = {
   ' ', '!', '"', '#', '$', '%', '&', '\'',
diff --git a/saveresume.c b/saveresume.c
index ab47a3b..f13e3f3 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "advent.h"
-#include "newdb.h"
+#include "dungeon.h"
 #include "linenoise/linenoise.h"
 
 /*
diff --git a/score.c b/score.c
index 531b230..d707fb8 100644
--- a/score.c
+++ b/score.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include "advent.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 /*
  * scoring and wrap-up
-- 
2.31.1