diff --git a/rogue/Makefile b/rogue/Makefile index 1279498..435e909 100644 --- a/rogue/Makefile +++ b/rogue/Makefile @@ -1,9 +1,15 @@ +SCOREFILE = "/var/games/rogue.scores" +SCREENDUMP = "rogue.screen" + +CFLAGS += -D_PATH_SCOREFILE=$(SCOREFILE) -D_PATH_SCREENDUMP=$(SCREENDUMP) +CFLAGS += -lcurses + OBJ = hit.o init.o inventory.o level.o machdep.o main.o message.o monster.o \ move.o object.o pack.o play.o ring.o room.o save.o score.o spec_hit.o \ throw.o trap.o use.o zap.o rogue: $(OBJ) - $(CC) $(CFLAGS) -lcurses -o $@ $(OBJ) + $(CC) $(CFLAGS) -o $@ $(OBJ) clean: rm -f $(OBJ) rogue diff --git a/rogue/machdep.h b/rogue/machdep.h index a15e3c7..a1ede45 100644 --- a/rogue/machdep.h +++ b/rogue/machdep.h @@ -1,5 +1,4 @@ #include "rogue.h" -#include "pathnames.h" void md_slurp(void); void md_heed_signals(void); diff --git a/rogue/message.c b/rogue/message.c index 7ee6ecb..8805e06 100644 --- a/rogue/message.c +++ b/rogue/message.c @@ -48,7 +48,6 @@ #include #include #include "rogue.h" -#include "pathnames.h" static char msgs[NMESSAGES][DCOLS] = {"", "", "", "", ""}; static short msg_col = 0, imsg = -1; diff --git a/rogue/pathnames.h b/rogue/pathnames.h deleted file mode 100644 index d6e91a5..0000000 --- a/rogue/pathnames.h +++ /dev/null @@ -1,35 +0,0 @@ -/* $NetBSD: pathnames.h,v 1.5 2008/01/14 03:50:02 dholland Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - */ - -#define _PATH_SCOREFILE "/var/games/rogue.scores" -#define _PATH_SCREENDUMP "rogue.screen" diff --git a/rogue/score.c b/rogue/score.c index 3562854..f164335 100644 --- a/rogue/score.c +++ b/rogue/score.c @@ -46,7 +46,6 @@ #include #include "rogue.h" -#include "pathnames.h" static void center(short, const char *); static int get_value(const object *);