#include "linenoise/linenoise.h"
#include "newdb.h"
+#define DIM(a) (sizeof(a)/sizeof(a[0]))
+
+/* Abstract out the encoding of words in the travel array. Gives us
+ * some hope of getting to a less cryptic representation than we
+ * inherited from FORTRAN, someday. To understand these, read the
+ * encoding description in dungeon.c.
+ */
+#define T_DESTINATION(entry) MOD(labs(entry) / 1000, 1000)
+#define T_NODWARVES(entry) labs(entry) / 1000000 == 100
+#define T_MOTION(entry) MOD(labs(entry), 1000)
+#define L_SPEAK(loc) ((loc) - 500)
+
struct game_t game;
long LNLENG, LNPOSN;
continue;
/* Pirate won't take pyramid from plover room or dark
* room (too easy!). */
- if (treasure == PYRAMID && (game.loc == PLAC[PYRAMID] || game.loc == PLAC[EMERALD])) {
+ if (treasure == PYRAMID && (game.loc == object_descriptions[PYRAMID].plac || game.loc == object_descriptions[EMERALD].plac)) {
continue;
}
if (TOTING(treasure) || HERE(treasure))
for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
if (!object_descriptions[treasure].is_treasure)
continue;
- if (!(treasure == PYRAMID && (game.loc == PLAC[PYRAMID] || game.loc == PLAC[EMERALD]))) {
+ if (!(treasure == PYRAMID && (game.loc == object_descriptions[PYRAMID].plac || game.loc == object_descriptions[EMERALD].plac))) {
if (AT(treasure) && game.fixed[treasure] == 0)
CARRY(treasure, game.loc);
if (TOTING(treasure))
kk = KEY[game.dloc[i]];
if (kk != 0)
do {
- game.newloc = MOD(labs(TRAVEL[kk]) / 1000, 1000);
+ game.newloc = T_DESTINATION(TRAVEL[kk]);
/* Have we avoided a dwarf encounter? */
bool avoided = (SPECIAL(game.newloc) ||
!INDEEP(game.newloc) ||
game.newloc == game.odloc[i] ||
(j > 1 && game.newloc == tk[j - 1]) ||
- j >= 20 ||
+ j >= DIM(tk) - 1 ||
game.newloc == game.dloc[i] ||
FORCED(game.newloc) ||
(i == PIRATE && CNDBIT(game.newloc, COND_NOARRR)) ||
- labs(TRAVEL[kk]) / 1000000 == 100);
+ T_NODWARVES(TRAVEL[kk]));
if (!avoided) {
tk[j++] = game.newloc;
}
if (CNDBIT(game.loc, COND_NOBACK))k2 = TWIST_TURN;
if (k2 == 0) {
for (;;) {
- scratchloc = MOD((labs(TRAVEL[kk]) / 1000), 1000);
+ scratchloc = T_DESTINATION(TRAVEL[kk]);
if (scratchloc != motion) {
if (!SPECIAL(scratchloc)) {
- if (FORCED(scratchloc) && MOD((labs(TRAVEL[KEY[scratchloc]]) / 1000), 1000) == motion)
+ if (FORCED(scratchloc) && T_DESTINATION(TRAVEL[KEY[scratchloc]]) == motion)
k2 = kk;
}
if (TRAVEL[kk] >= 0) {
}
}
- motion = MOD(labs(TRAVEL[kk]), 1000);
+ motion = T_MOTION(TRAVEL[kk]);
kk = KEY[game.loc];
break; /* fall through to ordinary travel */
}
game.prop[TROLL] = 0;
MOVE(TROLL2, 0);
MOVE(TROLL2 + NOBJECTS, 0);
- MOVE(TROLL, PLAC[TROLL]);
- MOVE(TROLL + NOBJECTS, FIXD[TROLL]);
+ MOVE(TROLL, object_descriptions[TROLL].plac);
+ MOVE(TROLL + NOBJECTS, object_descriptions[TROLL].fixd);
JUGGLE(CHASM);
game.newloc = game.loc;
return true;
} else {
- game.newloc = PLAC[TROLL] + FIXD[TROLL] - game.loc;
+ game.newloc = object_descriptions[TROLL].plac + object_descriptions[TROLL].fixd - game.loc;
if (game.prop[TROLL] == 0)game.prop[TROLL] = 1;
if (!TOTING(BEAR)) return true;
rspeak(BRIDGE_COLLAPSE);
}
} while
(false);
- /* FIXME: Arithmetic on location number, becoming a message number */
- rspeak(game.newloc - 500);
+
+ /* Execute a speak rule */
+ rspeak(L_SPEAK(game.newloc));
game.newloc = game.loc;
return true;
}
* to suppress the object descriptions until he's actually moved the
* objects. */
{
- if (game.tally == 0 && INDEEP(game.loc) && game.loc != 33)
+ if (game.tally == 0 && INDEEP(game.loc) && game.loc != LOC_Y2)
--game.clock1;
/* When the first warning comes, we lock the grate, destroy
}
MOVE(TROLL, 0);
MOVE(TROLL + NOBJECTS, 0);
- MOVE(TROLL2, PLAC[TROLL]);
- MOVE(TROLL2 + NOBJECTS, FIXD[TROLL]);
+ MOVE(TROLL2, object_descriptions[TROLL].plac);
+ MOVE(TROLL2 + NOBJECTS, object_descriptions[TROLL].fixd);
JUGGLE(CHASM);
if (game.prop[BEAR] != 3)DESTROY(BEAR);
game.prop[CHAIN] = 0;