From 164ad253f1b6deca89b906d89b6f93e5c64d6419 Mon Sep 17 00:00:00 2001 From: fluffymormegil Date: Fri, 16 Mar 2012 17:04:06 +0000 Subject: [PATCH] Updated copyright notices and revised startup banner --- Makefile | 20 ++++++++++---------- bmagic.c | 2 +- combat.c | 2 +- display.c | 8 ++++---- dunbash.h | 4 +++- main.c | 2 +- map.c | 2 +- misc.c | 2 +- mon2.c | 2 +- monsters.c | 2 +- objects.c | 2 +- permobj.c | 2 +- permons.c | 2 +- pmon2.c | 2 +- rng.c | 2 +- u.c | 2 +- vector.c | 2 +- 17 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 1d251ce..72e1242 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,17 @@ -# Makefile for Dungeon Bash +# Makefile for Cave Chop (7DRL) # # Linux/gcc only; I'm writing this in riceboy-hacker mode. Deal. OBJS=bmagic.o combat.o display.o main.o map.o misc.o monsters.o mon2.o objects.o permobj.o permons.o pmon2.o rng.o u.o vector.o -GAME=dungeonbash -# MPR: per , users are advised to remove -Werror when -# building on Darwin due to a bug in Darwin's version of "ncurses.h". -# -# It is apparently possible to build this code for Windows XP, although I have -# no details. +GAME=cavechop MAJVERS=1 -MINVERS=7 -CFLAGS=-c -g -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Werror -Wredundant-decls -Wunreachable-code -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) +MINVERS=0 +PRODUCTION_CFLAGS=-c -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wredundant-decls -Wunreachable-code -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) +DEVELOPMENT_CFLAGS=-c -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wredundant-decls -Wunreachable-code -Werror -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) +CFLAGS=$(DEVELOPMENT_CFLAGS) LINKFLAGS=-lpanel -lncurses -g +ARCHIVEDIR=cavedir7drl all: $(GAME) @@ -21,7 +19,9 @@ $(GAME): $(OBJS) $(CC) $(OBJS) $(LINKFLAGS) -o $(GAME) archive: clean - (cd .. && tar cvzf dungeonbash-$(MAJVERS).$(MINVERS).tar.gz dungeonbash-$(MAJVERS).$(MINVERS)) + mkdir $(ARCHIVEDIR) + cp `cat MANIFEST` $(ARCHIVEDIR) + tar czf $(ARCHIVEDIR).tgz $(ARCHIVEDIR) clean: -rm -f *.o $(GAME) dunbash.log dunbash.sav.gz diff --git a/bmagic.c b/bmagic.c index 9c2e482..0e3b994 100644 --- a/bmagic.c +++ b/bmagic.c @@ -1,6 +1,6 @@ /* bmagic.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/combat.c b/combat.c index 3d7e8a4..6ff9e4c 100644 --- a/combat.c +++ b/combat.c @@ -1,6 +1,6 @@ /* combat.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/display.c b/display.c index 188d5e3..d5c81bf 100644 --- a/display.c +++ b/display.c @@ -1,6 +1,6 @@ /* display.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -265,9 +265,9 @@ int display_init(void) idcok(status_window, FALSE); idcok(world_window, FALSE); idcok(message_window, FALSE); - mvwprintw(world_window, 6, 5, " Martin's"); - mvwprintw(world_window, 7, 5, "Dungeon Bash"); - mvwprintw(world_window, 9, 5, "Version %d.%d", MAJVERS, MINVERS); + mvwprintw(world_window, 7, 7, "Cave Chop"); + mvwprintw(world_window, 9, 2, "Seven-Day Roguelike"); + mvwprintw(world_window, 11, 4, "By Martin Read"); wmove(message_window, 0, 0); map_updated = FALSE; status_updated = FALSE; diff --git a/dunbash.h b/dunbash.h index 6663bcb..9881353 100644 --- a/dunbash.h +++ b/dunbash.h @@ -222,7 +222,9 @@ struct permon { #define PO_DRAGON_ARMOUR (PO_FIRST_ARMOUR + 7) #define PO_METEOR_ARMOUR (PO_FIRST_ARMOUR + 8) #define PO_SACRED_MAIL (PO_FIRST_ARMOUR + 9) -#define PO_LAST_ARMOUR PO_SACRED_MAIL +#define PO_BATTLE_BALLGOWN (PO_FIRST_ARMOUR + 10) +#define PO_RIBBONS (PO_FIRST_ARMOUR + 11) +#define PO_LAST_ARMOUR PO_RIBBONS #define PO_RING_REGEN (PO_LAST_ARMOUR + 1) #define PO_FIRST_RING PO_RING_REGEN #define PO_RING_FIRE (PO_FIRST_RING + 1) diff --git a/main.c b/main.c index 298960f..47c4d8f 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/map.c b/map.c index 8ec4905..aa75fbe 100644 --- a/map.c +++ b/map.c @@ -1,6 +1,6 @@ /* map.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/misc.c b/misc.c index 710475f..312f859 100644 --- a/misc.c +++ b/misc.c @@ -1,6 +1,6 @@ /* misc.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/mon2.c b/mon2.c index 22eedbf..7217a3b 100644 --- a/mon2.c +++ b/mon2.c @@ -1,6 +1,6 @@ /* mon2.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/monsters.c b/monsters.c index 9d93360..c6ffc77 100644 --- a/monsters.c +++ b/monsters.c @@ -1,6 +1,6 @@ /* monsters.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/objects.c b/objects.c index 1aa9200..0addcc0 100644 --- a/objects.c +++ b/objects.c @@ -1,6 +1,6 @@ /* objects.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/permobj.c b/permobj.c index 3dc763c..495fce0 100644 --- a/permobj.c +++ b/permobj.c @@ -1,6 +1,6 @@ /* permobj.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/permons.c b/permons.c index 3090416..717c730 100644 --- a/permons.c +++ b/permons.c @@ -1,6 +1,6 @@ /* permons.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/pmon2.c b/pmon2.c index 8aa8938..f265f82 100644 --- a/pmon2.c +++ b/pmon2.c @@ -1,6 +1,6 @@ /* pmon2.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/rng.c b/rng.c index 9fc0dcf..303615f 100644 --- a/rng.c +++ b/rng.c @@ -1,6 +1,6 @@ /* rng.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/u.c b/u.c index f249e7b..c6d31ae 100644 --- a/u.c +++ b/u.c @@ -1,6 +1,6 @@ /* u.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/vector.c b/vector.c index 32b0f65..eba1a9c 100644 --- a/vector.c +++ b/vector.c @@ -1,6 +1,6 @@ /* vector.c * - * Copyright 2005 Martin Read + * Copyright 2005-2012 Martin Read * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- 2.11.0