From 476d2b8cf076c51c8aa05419833b24369b8ee286 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 3 Feb 2008 20:01:24 +0000 Subject: A long time ago, larn had code to prohibit playing it during work hours. Most of this code was removed ages ago, probably when dm(6) was invented; long before -r1.1 in the NetBSD tree in any event. Now remove the last fragment of it. Also nuke the file of US holidays 1987-1993 that we've been carrying around for no reason. --- larn/header.h | 4 ++-- larn/holidays | 66 ----------------------------------------------------------- larn/tok.c | 27 ++++++------------------ 3 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 larn/holidays (limited to 'larn') diff --git a/larn/header.h b/larn/header.h index b33797d3..ad69b217 100644 --- a/larn/header.h +++ b/larn/header.h @@ -1,4 +1,4 @@ -/* $NetBSD: header.h,v 1.19 2008/02/03 19:29:50 dholland Exp $ */ +/* $NetBSD: header.h,v 1.20 2008/02/03 20:01:24 dholland Exp $ */ /* header.h Larn is copyrighted 1986 by Noah Morgan. */ @@ -361,7 +361,7 @@ extern short diroffx[], diroffy[], hitflag, hit2flag, hit3flag, hitp[MAXX][MA extern short iarg[MAXX][MAXY], ivenarg[], lasthx, lasthy, lastnum, lastpx, lastpy; extern short nobeep, oldx, oldy, playerx, playery, level; -extern int dayplay, enable_scroll, srcount, yrepcount, userid, wisid, +extern int enable_scroll, srcount, yrepcount, userid, wisid, io_outfd, io_infd; extern gid_t gid, egid; extern long outstanding_taxes, skill[], gltime, c[], cbak[]; diff --git a/larn/holidays b/larn/holidays deleted file mode 100644 index 3071ea44..00000000 --- a/larn/holidays +++ /dev/null @@ -1,66 +0,0 @@ -"Nov 27 1986 Thanksgiving" -"Dec 25 1986 Christmas" - -"Jan 01 1987 New Years Day." -"Feb 16 1987 Washingtons Birthday (Presidents Day)" -"May 25 1987 Memorial Day" -"Jul 04 1987 Independence Day" -"Sep 07 1987 Labor Day" -"Oct 12 1987 Columbus Day" -"Nov 26 1987 Thanksgiving" -"Dec 25 1987 Christmas" - -"Jan 01 1988 New Years Day." -"Feb 15 1988 Washingtons Birthday (Presidents Day)" -"May 30 1988 Memorial Day" -"Jul 04 1988 Independence Day" -"Sep 05 1988 Labor Day" -"Oct 10 1988 Columbus Day" -"Nov 24 1988 Thanksgiving" -"Dec 25 1988 Christmas" - -"Jan 01 1989 New Years Day." -"Feb 13 1989 Washingtons Birthday (Presidents Day)" -"May 28 1989 Memorial Day" -"Jul 04 1989 Independence Day" -"Sep 03 1989 Labor Day" -"Oct 15 1989 Columbus Day" -"Nov 29 1989 Thanksgiving" -"Dec 25 1989 Christmas" - -"Jan 01 1990 New Years Day." -"Feb 12 1990 Washingtons Birthday (Presidents Day)" -"May 27 1990 Memorial Day" -"Jul 04 1990 Independence Day" -"Sep 02 1990 Labor Day" -"Oct 14 1990 Columbus Day" -"Nov 28 1990 Thanksgiving" -"Dec 25 1990 Christmas" - -"Jan 01 1991 New Years Day." -"Feb 11 1991 Washingtons Birthday (Presidents Day)" -"May 26 1991 Memorial Day" -"Jul 04 1991 Independence Day" -"Sep 01 1991 Labor Day" -"Oct 10 1991 Columbus Day" -"Nov 27 1991 Thanksgiving" -"Dec 25 1991 Christmas" - -"Jan 01 1992 New Years Day." -"Feb 10 1992 Washingtons Birthday (Presidents Day)" -"May 25 1992 Memorial Day" -"Jul 04 1992 Independence Day" -"Sep 07 1992 Labor Day" -"Oct 12 1992 Columbus Day" -"Nov 26 1992 Thanksgiving" -"Dec 25 1992 Christmas" - -"Jan 01 1993 New Years Day." -"Feb 15 1993 Washingtons Birthday (Presidents Day)" -"May 30 1993 Memorial Day" -"Jul 04 1993 Independence Day" -"Sep 05 1993 Labor Day" -"Oct 10 1993 Columbus Day" -"Nov 24 1993 Thanksgiving" -"Dec 25 1993 Christmas" - diff --git a/larn/tok.c b/larn/tok.c index f76d5268..13512eb7 100644 --- a/larn/tok.c +++ b/larn/tok.c @@ -1,9 +1,9 @@ -/* $NetBSD: tok.c,v 1.7 2008/01/28 05:38:54 dholland Exp $ */ +/* $NetBSD: tok.c,v 1.8 2008/02/03 20:01:24 dholland Exp $ */ /* tok.c Larn is copyrighted 1986 by Noah Morgan. */ #include #ifndef lint -__RCSID("$NetBSD: tok.c,v 1.7 2008/01/28 05:38:54 dholland Exp $"); +__RCSID("$NetBSD: tok.c,v 1.8 2008/02/03 20:01:24 dholland Exp $"); #endif /* not lint */ #include @@ -16,7 +16,7 @@ __RCSID("$NetBSD: tok.c,v 1.7 2008/01/28 05:38:54 dholland Exp $"); #include "extern.h" static char lastok = 0; -int yrepcount = 0, dayplay = 0; +int yrepcount = 0; #ifndef FLUSHNO #define FLUSHNO 5 #endif /* FLUSHNO */ @@ -65,22 +65,6 @@ yylex() exit(); } #endif - - -#ifdef TIMECHECK - if (dayplay == 0) - if (playable()) { - cursor(1, 19); - lprcat("\nSorry, but it is now time for work. Your game has been saved.\n"); - beep(); - lflush(); - savegame(savefilename); - wizard = nomove = 1; - sleep(4); - died(-257); - } -#endif /* TIMECHECK */ - } do { /* if keyboard input buffer is too big, flush * some of it */ @@ -249,8 +233,9 @@ readopts() if ((i = lgetw()) == 0) break; strlcpy(psname, i, PSNAMESIZE); - } else if (strcmp(i, "play-day-play") == 0) - dayplay = 1; + } else if (strcmp(i, "play-day-play") == 0) { + /* bypass time restrictions: ignored */ + } break; case 's': -- cgit v1.2.3-56-ge451