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

Prevent confusion between dungeonmaker and runtime variables.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-07 09:21:05 -04:00
parent b2c85b36f8
commit 844cb05619
1 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

83
dungeon.c
View file

@ -32,7 +32,6 @@ const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85,
static long LNLENG; static long LNLENG;
static long LNPOSN; static long LNPOSN;
static char INLINE[LINESIZE+1]; static char INLINE[LINESIZE+1];
static long NEWLOC;
static long OLDLOC; static long OLDLOC;
// Storage for what comes out of the database // Storage for what comes out of the database
@ -295,25 +294,25 @@ int read_database(FILE* database) {
while(true) while(true)
{ {
long SECT=GETNUM(database); long sect=GETNUM(database);
OLDLOC= -1; OLDLOC= -1;
switch (SECT) switch (sect)
{ {
case 0: return(0); case 0: return(0);
case 1: read_messages(database, SECT); break; case 1: read_messages(database, sect); break;
case 2: read_messages(database, SECT); break; case 2: read_messages(database, sect); break;
case 3: read_section3_stuff(database); break; case 3: read_section3_stuff(database); break;
case 4: read_vocabulary(database); break; case 4: read_vocabulary(database); break;
case 5: read_messages(database, SECT); break; case 5: read_messages(database, sect); break;
case 6: read_messages(database, SECT); break; case 6: read_messages(database, sect); break;
case 7: read_initial_locations(database); break; case 7: read_initial_locations(database); break;
case 8: read_action_verb_message_nr(database); break; case 8: read_action_verb_message_nr(database); break;
case 9: read_conditions(database); break; case 9: read_conditions(database); break;
case 10: read_messages(database, SECT); break; case 10: read_messages(database, sect); break;
case 11: read_hints(database); break; case 11: read_hints(database); break;
case 12: break; case 12: break;
case 13: read_sound_text(database); break; case 13: read_sound_text(database); break;
case 14: read_messages(database, SECT); break; case 14: read_messages(database, sect); break;
default: BUG(9); default: BUG(9);
} }
} }
@ -321,16 +320,16 @@ int read_database(FILE* database) {
/* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */ /* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */
void read_messages(FILE* database, long SECT) void read_messages(FILE* database, long sect)
{ {
long KK=LINUSE; long KK=LINUSE;
while(true) while(true)
{ {
long LOC; long loc;
LINUSE=KK; LINUSE=KK;
LOC=GETNUM(database); loc=GETNUM(database);
if(LNLENG >= LNPOSN+70)BUG(0); if(LNLENG >= LNPOSN+70)BUG(0);
if(LOC == -1) return; if(loc == -1) return;
if(LNLENG < LNPOSN)BUG(1); if(LNLENG < LNPOSN)BUG(1);
do { do {
KK=KK+1; KK=KK+1;
@ -339,63 +338,63 @@ void read_messages(FILE* database, long SECT)
} }
while(LINES[KK] != -1); while(LINES[KK] != -1);
LINES[LINUSE]=KK; LINES[LINUSE]=KK;
if(LOC == OLDLOC) continue; if(loc == OLDLOC) continue;
OLDLOC=LOC; OLDLOC=loc;
LINES[LINUSE]= -KK; LINES[LINUSE]= -KK;
if(SECT == 14) if(sect == 14)
{ {
TRNVLS=TRNVLS+1; TRNVLS=TRNVLS+1;
if(TRNVLS > TRNSIZ)BUG(11); if(TRNVLS > TRNSIZ)BUG(11);
TTEXT[TRNVLS]=LINUSE; TTEXT[TRNVLS]=LINUSE;
TRNVAL[TRNVLS]=LOC; TRNVAL[TRNVLS]=loc;
continue; continue;
} }
if(SECT == 10) if(sect == 10)
{ {
CLSSES=CLSSES+1; CLSSES=CLSSES+1;
if(CLSSES > CLSMAX)BUG(11); if(CLSSES > CLSMAX)BUG(11);
CTEXT[CLSSES]=LINUSE; CTEXT[CLSSES]=LINUSE;
CVAL[CLSSES]=LOC; CVAL[CLSSES]=loc;
continue; continue;
} }
if(SECT == 6) if(sect == 6)
{ {
if(LOC > RTXSIZ)BUG(6); if(loc > RTXSIZ)BUG(6);
RTEXT[LOC]=LINUSE; RTEXT[loc]=LINUSE;
continue; continue;
} }
if(SECT == 5) if(sect == 5)
{ {
if(LOC > 0 && LOC <= NOBJECTS)PTEXT[LOC]=LINUSE; if(loc > 0 && loc <= NOBJECTS)PTEXT[loc]=LINUSE;
continue; continue;
} }
if(LOC > LOCSIZ)BUG(10); if(loc > LOCSIZ)BUG(10);
if(SECT == 1) if(sect == 1)
{ {
LTEXT[LOC]=LINUSE; LTEXT[loc]=LINUSE;
continue; continue;
} }
STEXT[LOC]=LINUSE; STEXT[loc]=LINUSE;
} }
} }
/* The stuff for section 3 is encoded here. Each "from-location" gets a /* The stuff for section 3 is encoded here. Each "from-location" gets a
* contiguous section of the "TRAVEL" array. Each entry in travel is * contiguous section of the "TRAVEL" array. Each entry in travel is
* NEWLOC*1000 + KEYWORD (from section 4, motion verbs), and is negated if * newloc*1000 + KEYWORD (from section 4, motion verbs), and is negated if
* this is the last entry for this location. KEY(N) is the index in travel * this is the last entry for this location. KEY(N) is the index in travel
* of the first option at location N. */ * of the first option at location N. */
void read_section3_stuff(FILE* database) void read_section3_stuff(FILE* database)
{ {
long LOC; long loc;
while((LOC=GETNUM(database)) != -1) while((loc=GETNUM(database)) != -1)
{ {
long NEWLOC=GETNUM(NULL); long newloc=GETNUM(NULL);
long L; long L;
if(KEY[LOC] == 0) if(KEY[loc] == 0)
{ {
KEY[LOC]=TRVS; KEY[loc]=TRVS;
} }
else else
{ {
@ -403,7 +402,7 @@ void read_section3_stuff(FILE* database)
} }
while((L=GETNUM(NULL)) != 0) while((L=GETNUM(NULL)) != 0)
{ {
TRAVEL[TRVS]=NEWLOC*1000+L; TRAVEL[TRVS]=newloc*1000+L;
TRVS=TRVS+1; TRVS=TRVS+1;
if(TRVS == TRVSIZ)BUG(3); if(TRVS == TRVSIZ)BUG(3);
} }
@ -444,10 +443,10 @@ void read_initial_locations(FILE* database)
/* Read default message numbers for action verbs, store in ACTSPK. */ /* Read default message numbers for action verbs, store in ACTSPK. */
void read_action_verb_message_nr(FILE* database) void read_action_verb_message_nr(FILE* database)
{ {
long VERB; long verb;
while((VERB=GETNUM(database)) != -1) while((verb=GETNUM(database)) != -1)
{ {
ACTSPK[VERB]=GETNUM(NULL); ACTSPK[verb]=GETNUM(NULL);
} }
} }
@ -458,11 +457,11 @@ void read_conditions(FILE* database)
long K; long K;
while((K=GETNUM(database)) != -1) while((K=GETNUM(database)) != -1)
{ {
long LOC; long loc;
while((LOC=GETNUM(NULL)) != 0) while((loc=GETNUM(NULL)) != 0)
{ {
if(is_set(COND[LOC],K)) BUG(8); if(is_set(COND[loc],K)) BUG(8);
COND[LOC]=COND[LOC] + (1l << K); COND[loc]=COND[loc] + (1l << K);
} }
} }
} }