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

Remove unused code.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-24 12:43:31 -04:00
parent 1ec3ef3855
commit e9e747cffb
1 changed files with 14 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dungeon.c
View file

@ -60,6 +60,11 @@
* or "attack"). Else, if M=3, the word is a special case verb (such as * or "attack"). Else, if M=3, the word is a special case verb (such as
* "dig") and N % 1000 is an index into section 6. Objects from 50 to * "dig") and N % 1000 is an index into section 6. Objects from 50 to
* (currently, anyway) 79 are considered treasures (for pirate, closeout). * (currently, anyway) 79 are considered treasures (for pirate, closeout).
* Section 7: Object locations. Each line contains an object number and its
* initial location (zero (or omitted) if none). If the object is
* immovable, the location is followed by a "-1". If it has two locations
* (e.g. the grate) the first location is followed with the second, and
* the object is assumed to be immovable.
* Section 8: Action defaults. Each line contains an "action-verb" number and * Section 8: Action defaults. Each line contains an "action-verb" number and
* the index (in section 6) of the default message for the verb. * the index (in section 6) of the default message for the verb.
* Section 0: End of database. * Section 0: End of database.
@ -96,6 +101,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <string.h>
#include "newdb.h" #include "newdb.h"
#include "common.h" #include "common.h"
@ -251,45 +257,18 @@ static long GETNUM(FILE *source)
return (GETNUM); return (GETNUM);
} }
/* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */ /* Sections 1, 2, 5, 6, 10, 14. Skip these, they're all in YAML now. */
static void read_messages(FILE* database, long sect) static void read_messages(FILE* database, long sect)
{ {
long KK = LINUSE; long KK = LINUSE;
while (true) { while (true) {
long loc;
LINUSE = KK;
loc = GETNUM(database);
if (LNLENG >= LNPOSN + 70)
BUG(MESSAGE_LINE_GT_70_CHARACTERS);
if (loc == -1) return;
if (LNLENG < LNPOSN)
BUG(NULL_LINE_IN_MESSAGE);
do { do {
KK = KK + 1; if (NULL == fgets(INLINE + 1, sizeof(INLINE) - 1, database)) {
if (KK >= LINSIZ) printf("Failed fgets()\n");
BUG(TOO_MANY_WORDS_OF_MESSAGES);
LINES[KK] = GETTXT(false, false, false);
} while (LINES[KK] != -1);
LINES[LINUSE] = KK;
if (loc == OLDLOC) continue;
OLDLOC = loc;
LINES[LINUSE] = -KK;
if (sect == 10 || sect == 14) {
/* now parsed from YAML */
continue;
}
if (sect == 5) {
/* Now handled in YAML */
continue;
}
if (sect == 6) {
/* Now handled in YAML */
continue;
}
if (sect == 1) {
/* Now handled in YAML */
continue;
} }
} while (!feof(database) && INLINE[1] == '#');
if (strncmp(INLINE + 1, "-1\n", 3) == 0)
break;
} }
} }