#include "advent.h"
#include "database.h"
#include "linenoise/linenoise.h"
+#include "newdb.h"
struct game_t game;
RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,
STEPS, STREAM, THROW, TRIDNT, TROLL, TROLL2,
URN, VASE, VEND, VOLCAN, WATER;
-long K, SPK, WD1, WD1X, WD2, WD2X;
+long K, WD1, WD1X, WD2, WD2X;
FILE *logfp;
bool oldstyle = false;
if (TRAVEL[KK] < 0) {
/* Non-applicable motion. Various messages depending on
* word given. */
- SPK=12;
- if (K >= 43 && K <= 50)SPK=52;
- if (K == 29 || K == 30)SPK=52;
- if (K == 7 || K == 36 || K == 37)SPK=10;
- if (K == 11 || K == 19)SPK=11;
- if (verb == FIND || verb == INVENT)SPK=59;
- if (K == 62 || K == 65)SPK=42;
- if (K == 17)SPK=80;
- RSPEAK(SPK);
+ int spk=12;
+ if (K >= 43 && K <= 50)spk=52;
+ if (K == 29 || K == 30)spk=52;
+ if (K == 7 || K == 36 || K == 37)spk=10;
+ if (K == 11 || K == 19)spk=11;
+ if (verb == FIND || verb == INVENT)spk=59;
+ if (K == 62 || K == 65)spk=42;
+ if (K == 17)spk=80;
+ RSPEAK(spk);
return true;
}
++KK;
L2000: if (game.loc == 0)
croak(cmdin);
- KK=STEXT[game.loc];
- if (MOD(game.abbrev[game.loc],game.abbnum) == 0 || KK == 0)
- KK=LTEXT[game.loc];
+ char* msg = short_location_descriptions[game.loc];
+ if (MOD(game.abbrev[game.loc],game.abbnum) == 0 || msg == 0)
+ msg=long_location_descriptions[game.loc];
if (!FORCED(game.loc) && DARK(game.loc)) {
/* The easiest way to get killed is to fall into a pit in
* pitch darkness. */
croak(cmdin);
goto L2000;
}
- KK=RTEXT[16];
+ msg=arbitrary_messages[16];
}
if (TOTING(BEAR))RSPEAK(141);
- SPEAK(KK);
+ newspeak(msg);
K=1;
if (FORCED(game.loc)) {
goto L8;
L2607: game.foobar=(game.foobar>0 ? -game.foobar : 0);
++game.turns;
if (game.turns == game.thresh) {
- SPEAK(TTEXT[game.trndex]);
+ newspeak(turn_threshold_messages[game.trndex]);
game.trnluz=game.trnluz+TRNVAL[game.trndex]/100000;
++game.trndex;
game.thresh = -1;
} else if (game.limit <= 30) {
if (!game.lmwarn && HERE(LAMP)) {
game.lmwarn=true;
- SPK=187;
- if (game.place[BATTER] == 0)SPK=183;
- if (game.prop[BATTER] == 1)SPK=189;
- RSPEAK(SPK);
+ int spk=187;
+ if (game.place[BATTER] == 0)spk=183;
+ if (game.prop[BATTER] == 1)spk=189;
+ RSPEAK(spk);
}
}
L19999: K=43;