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

Purge magic numbers from C side of destination handling.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-07 07:50:39 -04:00
parent e619c41048
commit 2bdf9e2803
2 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
main.c
View file

@ -384,9 +384,10 @@ static bool dwarfmove(void)
kk = tkey[game.dloc[i]]; kk = tkey[game.dloc[i]];
if (kk != 0) if (kk != 0)
do { do {
game.newloc = travel[kk].dest; enum desttype_t desttype = travel[kk].desttype;
game.newloc = travel[kk].destval;
/* Have we avoided a dwarf encounter? */ /* Have we avoided a dwarf encounter? */
if (SPECIAL(game.newloc)) if (desttype != dest_goto)
continue; continue;
else if (!INDEEP(game.newloc)) else if (!INDEEP(game.newloc))
continue; continue;
@ -509,7 +510,8 @@ static bool traveleq(long a, long b)
/* Are two travel entries equal for purposes of skip after failed condition? */ /* Are two travel entries equal for purposes of skip after failed condition? */
{ {
return (travel[a].cond == travel[b].cond) return (travel[a].cond == travel[b].cond)
&& (travel[a].dest == travel[b].dest); && (travel[a].desttype == travel[b].desttype)
&& (travel[a].destval == travel[b].destval);
} }
/* Given the current location in "game.loc", and a motion verb number in /* Given the current location in "game.loc", and a motion verb number in
@ -545,10 +547,11 @@ static void playermove( int motion)
if (spk == 0) { if (spk == 0) {
int te_tmp = 0; int te_tmp = 0;
for (;;) { for (;;) {
scratchloc = travel[travel_entry].dest; enum desttype_t desttype = travel[travel_entry].desttype;
if (scratchloc != motion) { scratchloc = travel[travel_entry].destval;
if (!SPECIAL(scratchloc)) { if (desttype != dest_goto || scratchloc != motion) {
if (FORCED(scratchloc) && travel[tkey[scratchloc]].dest == motion) if (desttype == dest_goto) {
if (FORCED(scratchloc) && travel[tkey[scratchloc]].destval == motion)
te_tmp = travel_entry; te_tmp = travel_entry;
} }
if (!travel[travel_entry].stop) { if (!travel[travel_entry].stop) {
@ -662,17 +665,17 @@ static void playermove( int motion)
} }
/* Found an eligible rule, now execute it */ /* Found an eligible rule, now execute it */
game.newloc = travel[travel_entry].dest; enum desttype_t desttype = travel[travel_entry].desttype;
if (!SPECIAL(game.newloc)) game.newloc = travel[travel_entry].destval;
if (desttype == dest_goto)
return; return;
if (game.newloc > 500) { if (desttype == dest_speak) {
/* Execute a speak rule */ /* Execute a speak rule */
rspeak(L_SPEAK(game.newloc)); rspeak(game.newloc);
game.newloc = game.loc; game.newloc = game.loc;
return; return;
} else { } else {
game.newloc -= SPECIALBASE;
switch (game.newloc) { switch (game.newloc) {
case 1: case 1:
/* Special travel 1. Plover-alcove passage. Can carry only /* Special travel 1. Plover-alcove passage. Can carry only

23
make_dungeon.py
View file

@ -149,10 +149,13 @@ typedef struct {{
const char* message; const char* message;
}} special_t; }} special_t;
enum desttype_t {{dest_goto, dest_special, dest_speak}};
typedef struct {{ typedef struct {{
const long motion; const long motion;
const long cond; const long cond;
const long dest; const enum desttype_t desttype;
const long destval;
const bool nodwarves; const bool nodwarves;
const bool stop; const bool stop;
}} travelop_t; }} travelop_t;
@ -163,7 +166,6 @@ typedef struct {{
* encoding description for travel. * encoding description for travel.
*/ */
#define T_TERMINATE(entry) ((entry).motion == 1) #define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
extern const location_t locations[]; extern const location_t locations[];
extern const object_t objects[]; extern const object_t objects[];
@ -702,7 +704,7 @@ def buildtravel(locs, objs):
# #
# In order to de-crypticize the runtime code, we're going to break these # In order to de-crypticize the runtime code, we're going to break these
# magic numbers up into a struct. # magic numbers up into a struct.
travel = [[0, "LOC_NOWHERE", 0, 0, 0, "false", "false"]] travel = [[0, "LOC_NOWHERE", 0, 0, 0, 0, "false", "false"]]
tkey = [0] tkey = [0]
oldloc = 0 oldloc = 0
while ltravel: while ltravel:
@ -717,11 +719,21 @@ def buildtravel(locs, objs):
while rule: while rule:
cond = newloc // 1000 cond = newloc // 1000
dest = newloc % 1000 dest = newloc % 1000
if dest <= 300:
desttype = "dest_goto";
destval = locnames[dest]
elif dest > 500:
desttype = "dest_speak";
destval = msgnames[dest - 500]
else:
desttype = "dest_special";
destval = locnames[dest - 300]
travel.append([len(tkey)-1, travel.append([len(tkey)-1,
locnames[len(tkey)-1], locnames[len(tkey)-1],
rule.pop(0), rule.pop(0),
cond, cond,
locnames[dest] if dest <= 300 else dest, desttype,
destval,
"true" if cond==100 else "false", "true" if cond==100 else "false",
"false"]) "false"])
travel[-1][-1] = "true" travel[-1][-1] = "true"
@ -731,7 +743,8 @@ def get_travel(travel):
template = """ {{ // from {}: {} template = """ {{ // from {}: {}
.motion = {}, .motion = {},
.cond = {}, .cond = {},
.dest = {}, .desttype = {},
.destval = {},
.nodwarves = {}, .nodwarves = {},
.stop = {}, .stop = {},
}}, }},