Finish newdb -> dungeon renaming.

diff --git a/.gitignore b/.gitignore
index a99743d641bc5f0d34a1803ac40affc03d503017..ddb549be2c1eb4b2bd1d195aa710eeab5091a349 100644 (file)
--- 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 d16b12b8f0cfb36814af8d3d332b8d6a23da2835..758408ab571a1d0ade40024445de83117d0ea7c5 100644 (file)
--- 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 f746dee1edfe8003c719d45b22aafb16dfba121f..e01d2cf3b3d212581724af213bef9ba9932ef2d5 100644 (file)
--- 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 7846e8fe2007c3ea2b32f368ca6e4b92be2b50ba..3cd2e23a369ff2ad69ec3f11bdf4d624a3f21c71 100644 (file)
--- 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 858a916713ca3732566b72449edcbc77dc822084..d9da4057f8b0a41eb2ab49e6cfeddb64add7ebfb 100644 (file)
--- 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 c5dc311d0e7cf7a6b4e32107ec482a3d57afdc4e..c19705743e784766bff33fa4caa7dab54e2083ab 100644 (file)
--- 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 4e3aeb321c7eb82503d4e0ab665987e38c295ba2..ae43668a530e3397465cc0da26e8472ab75e74cb 100644 (file)
--- 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 ab47a3bfa56fd84a19c30e01848a7425963fc1a4..f13e3f366d40c04f4ee909799d9470683355dc82 100644 (file)
--- 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 531b230cfbbc154ddddae4625f6c4bf02d49f0af..d707fb8800fce8a95e78ade217cdd4810bf80972 100644 (file)
--- 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