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

Forther break apart the magic enconding of travel arrays.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-01 12:51:12 -04:00
parent c98668c529
commit 50bbbbceee
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.c
View file

@ -628,7 +628,7 @@ static bool playermove( int motion)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp; ++te_tmp;
} while } while
(T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp])); ((T_DESTINATION(travel[travel_entry]) == T_DESTINATION(travel[te_tmp])) && (T_CONDITION(travel[travel_entry]) == T_CONDITION(travel[te_tmp])));
travel_entry = te_tmp; travel_entry = te_tmp;
} }
@ -670,7 +670,7 @@ static bool playermove( int motion)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp; ++te_tmp;
} while } while
(T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp])); ((T_DESTINATION(travel[travel_entry]) == T_DESTINATION(travel[te_tmp])) && (T_CONDITION(travel[travel_entry]) == T_CONDITION(travel[te_tmp])));
travel_entry = te_tmp; travel_entry = te_tmp;
continue; /* goto L12 */ continue; /* goto L12 */
case 3: case 3:

17
make_dungeon.py
View file

@ -146,6 +146,7 @@ typedef struct {{
typedef struct {{ typedef struct {{
const long motion; const long motion;
const long cond;
const long dest; const long dest;
const bool stop; const bool stop;
}} travelop_t; }} travelop_t;
@ -155,10 +156,9 @@ typedef struct {{
* inherited from FORTRAN, someday. To understand these, read the * inherited from FORTRAN, someday. To understand these, read the
* encoding description for travel. * encoding description for travel.
*/ */
#define T_DESTINATION(entry) MOD((entry).dest, 1000) #define T_DESTINATION(entry) (entry).dest
#define T_CONDITION(entry) ((entry).dest / 1000) #define T_CONDITION(entry) (entry).cond
#define T_NODWARVES(entry) (T_CONDITION(entry) == 100) #define T_NODWARVES(entry) (T_CONDITION(entry) == 100)
#define T_HIGH(entry) ((entry).dest)
#define T_TERMINATE(entry) ((entry).motion == 1) #define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500) #define L_SPEAK(loc) ((loc) - 500)
@ -670,7 +670,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, 0, False]] travel = [[0, 0, 0, False]]
tkey = [0] tkey = [0]
oldloc = 0 oldloc = 0
while ltravel: while ltravel:
@ -681,22 +681,23 @@ def buildtravel(locs, objs):
tkey.append(len(travel)) tkey.append(len(travel))
oldloc = loc oldloc = loc
elif travel: elif travel:
travel[-1][2] = not travel[-1][2] travel[-1][-1] = not travel[-1][-1]
while rule: while rule:
travel.append([rule.pop(0), newloc, False]) travel.append([rule.pop(0), newloc // 1000, newloc % 1000, False])
travel[-1][2] = True travel[-1][-1] = True
return (travel, tkey) return (travel, tkey)
def get_travel(travel): def get_travel(travel):
template = """ {{ template = """ {{
.motion = {}, .motion = {},
.cond = {},
.dest = {}, .dest = {},
.stop = {}, .stop = {},
}}, }},
""" """
out = "" out = ""
for entry in travel: for entry in travel:
out += template.format(entry[0], entry[1], entry[2]).lower() out += template.format(entry[0], entry[1], entry[2], entry[3]).lower()
out = out[:-1] # trim trailing newline out = out[:-1] # trim trailing newline
return out return out