From 616573413d99f1df7c961198418dea230a8fdc1f Mon Sep 17 00:00:00 2001 From: Martin Read Date: Sat, 21 Sep 2013 22:24:42 +0100 Subject: [PATCH] Some cleanup of cavechop references --- Makefile | 12 ++++++------ main.c | 12 ++++++------ notes.txt | 47 +++++++++++++++++------------------------------ u.c | 2 +- 4 files changed, 30 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index e4fcc3b..82a734d 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,14 @@ OBJS=bmagic.o combat.o display-nc.o main.o map.o misc.o monsters.o mon2.o object include dirs.mk include features.mk -GAME=victrix-abyssi -MAJVERS=1 -MINVERS=0 -PRODUCTION_CFLAGS=-c -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) -DEVELOPMENT_CFLAGS=-c -g -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -Werror -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) +GAME:=victrix-abyssi +MAJVERS:=1 +MINVERS:=0 +PRODUCTION_CFLAGS:=-c -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) +DEVELOPMENT_CFLAGS:=-c -g -Wall -Wstrict-prototypes -Wwrite-strings -Wmissing-prototypes -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -Werror -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) CFLAGS=$(PRODUCTION_CFLAGS) LINKFLAGS=-lpanelw -lncursesw -g -ARCHIVEDIR=victrix-abyssi +ARCHIVEDIR:=victrix-abyssi_$(MAJVERS).$(MINVERS) all: $(GAME) diff --git a/main.c b/main.c index 561b0b7..184dc16 100644 --- a/main.c +++ b/main.c @@ -83,7 +83,7 @@ unsigned int convert_range(int dy, int dx) void save_game(void) { FILE *fp; - fp = fopen("cavechop.sav", "wb"); + fp = fopen("victrix-abyssi.sav", "wb"); /* Write out the snapshot we took of the RNG before generating the * current level. */ fwrite(saved_state, sizeof saved_state, 1, fp); @@ -108,7 +108,7 @@ void save_game(void) fflush(fp); fclose(fp); /* Compress! */ - system("gzip cavechop.sav"); + system("gzip victrix-abyssi.sav"); game_finished = 1; return; } @@ -116,8 +116,8 @@ void save_game(void) void load_game(void) { FILE *fp; - system("gunzip cavechop.sav"); - fp = fopen("cavechop.sav", "rb"); + system("gunzip victrix-abyssi.sav"); + fp = fopen("victrix-abyssi.sav", "rb"); fread(rng_state, sizeof rng_state, 1, fp); build_level(); fread(mapflags, DUN_HEIGHT, DUN_WIDTH * sizeof (int), fp); @@ -130,7 +130,7 @@ void load_game(void) fread(&u, 1, sizeof u, fp); fread(&game_tick, 1, sizeof game_tick, fp); fclose(fp); - unlink("cavechop.sav"); + unlink("victrix-abyssi.sav"); touch_back_buffer(); status_updated = 1; map_updated = 1; @@ -618,7 +618,7 @@ int main(void) memset(mapobject, -1, sizeof mapobject); memset(mapmonster, -1, sizeof mapmonster); /* Do we have a saved game? */ - i = stat("cavechop.sav.gz", &s); + i = stat("victrix-abyssi.sav.gz", &s); if (!i) { /* Yes! */ diff --git a/notes.txt b/notes.txt index 08f2dac..0199d14 100644 --- a/notes.txt +++ b/notes.txt @@ -1,11 +1,11 @@ -CAVE CHOP SEVEN-DAY ROGUELIKE -================================== -Copyright 2012 Martin Read. +VICTRIX ABYSSI +============== +Copyright 2013 Martin Read. This software is released under the terms of the BSD-style licence as provided in the file /usr/share/doc/apps/LICENSES/BSD on a Debian GNU/Linux system. -Cave Chop (aka "cavechop") is copyright 2012 Martin Read. +Victrix Abyssi (aka "victrix-abyssi") is copyright 2013 Martin Read. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -32,46 +32,33 @@ INSTALLATION INSTRUCTIONS ------------------------- On Linux (and other Unix-like systems, though I don't guarantee it working on any given Unix): - tar xzf cavechop7drl.tar.gz - cd cavechop7drl + tar xzf victrix-abyssi.tar.gz + cd victrix-abyssi make all - cp cavechop /somewhere/in/your/PATH + cp victrix-abyssi /somewhere/in/your/PATH -The cavechop binary does not require any setgid or setuid privileges, and +The victrix-abyssi binary does not require any setgid or setuid privileges, and does not require root privilege to install unless you want to put it in a system directory (e.g. /usr/local/games), as it has no shared data and no shared playground. Players are trusted to not savescum, because savescumming is cheating, and cheating sucks. -There are not official binary releases of Cave Chop contemporaneous with the -source release. - ABOUT THE GAME -------------- -This is the seven-day roguelike Cave Chop. +Welcome to the Abyss, Princess. -Like its progenitor, Martin's Dungeon Bash v1.7, Cave Chop has a very simple -concept: Kill as many monsters as you can, diving ever deeper into the -infinite hellish caverns in which you are trapped, until you die. There is no -"victory" condition; the only objective provided by the design is "see how far -you get and how many monsters you kill". +Your younger brother, a bastard in every sense, has deprived you of your +rightful inheritance and condemned you to these inescapable caverns, in the +expectation that you will either starve or be devoured. -As you dive deeper into the dungeon, you will meet more fearsome foes, and -familiar foes will increase in power. It is said that eventually, the -beasts of the dungeon grow so mighty that they can slay even the boldest of -heroes with a single blow. +You have a dagger, a token supply of food, your favorite armoured dress, and no +intention of obliging him. -Discussion of Cave Chop is on-topic for the newsgroup -rec.games.roguelike.misc ; please put -cavechop- in the Subject: header of any -post to RGRM regarding Cave Chop. +Discussion of Victrix Abyssi is on-topic for the newsgroup +rec.games.roguelike.misc ; please put -victrix-abyssi- in the Subject: header +of any post to RGRM regarding Victrix Abyssi. REPORTING BUGS -------------- Report bugs by e-mail to martin (at) blackswordsonics dot com. -THANKS TO ---------- -* Jeff Lait, Jon Amery, Adam White, Gero Kunter, David Damerell, and Richard - Kettlewell for advice, inspiration, suggestions, and bug reports that helped - make Martin's Dungeon Bash 1.7 the game it was and is. - diff --git a/u.c b/u.c index f66fd6e..14c68f3 100644 --- a/u.c +++ b/u.c @@ -341,7 +341,7 @@ int do_death(enum death d, const char *what) } if (!wizard_mode) { - fp = fopen("cavechop.log", "a"); + fp = fopen("victrix-abyssi.log", "a"); } print_msg("THOU ART SLAIN!\n"); game_finished = 1; -- 2.11.0