archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish newdb -> dungeon renaming.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-29 08:49:12 -07:00
parent db281a96d7
commit 1ee0e5c7b0
9 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -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/*

34
Makefile
View file

@ -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

2
actions.c
View file

@ -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);

2
advent.h
View file

@ -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 */

2
cheat.c
View file

@ -6,7 +6,7 @@
#include <time.h>
#include "advent.h"
#include "linenoise/linenoise.h"
#include "newdb.h"
#include "dungeon.h"
struct game_t game;

2
main.c
View file

@ -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]))

2
misc.c
View file

@ -8,7 +8,7 @@
#include "advent.h"
#include "linenoise/linenoise.h"
#include "newdb.h"
#include "dungeon.h"
const char new_advent_to_ascii[] = {
' ', '!', '"', '#', '$', '%', '&', '\'',

2
saveresume.c
View file

@ -2,7 +2,7 @@
#include <string.h>
#include "advent.h"
#include "newdb.h"
#include "dungeon.h"
#include "linenoise/linenoise.h"
/*

2
score.c
View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "advent.h"
#include "newdb.h"
#include "dungeon.h"
/*
* scoring and wrap-up