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

23
make_dungeon.py
View file

@ -149,10 +149,13 @@ typedef struct {{
const char* message;
}} special_t;
enum desttype_t {{dest_goto, dest_special, dest_speak}};
typedef struct {{
const long motion;
const long cond;
const long dest;
const enum desttype_t desttype;
const long destval;
const bool nodwarves;
const bool stop;
}} travelop_t;
@ -163,7 +166,6 @@ typedef struct {{
* encoding description for travel.
*/
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
extern const location_t locations[];
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
# 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]
oldloc = 0
while ltravel:
@ -717,11 +719,21 @@ def buildtravel(locs, objs):
while rule:
cond = 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,
locnames[len(tkey)-1],
rule.pop(0),
cond,
locnames[dest] if dest <= 300 else dest,
desttype,
destval,
"true" if cond==100 else "false",
"false"])
travel[-1][-1] = "true"
@ -731,7 +743,8 @@ def get_travel(travel):
template = """ {{ // from {}: {}
.motion = {},
.cond = {},
.dest = {},
.desttype = {},
.destval = {},
.nodwarves = {},
.stop = {},
}},