SPK is no longer global.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 5f69f665355c7bb583b8031ec7806d160e4f48ff..e10239833a1f72c6156294ef3d5faf21364d09fd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
 #include "advent.h"
 #include "database.h"
 #include "linenoise/linenoise.h"
+#include "newdb.h"
 
 struct game_t game;
 
@@ -38,7 +39,7 @@ long AMBER, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                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;
@@ -566,15 +567,15 @@ static bool playermove(FILE *cmdin, token_t verb)
        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;
@@ -709,9 +710,9 @@ static bool do_command(FILE *cmdin)
 
 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. */
@@ -721,10 +722,10 @@ L2000:    if (game.loc == 0)
                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;
@@ -815,7 +816,7 @@ L2600:      if (COND[game.loc] >= game.conds) {
 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;
@@ -960,10 +961,10 @@ L2607:    game.foobar=(game.foobar>0 ? -game.foobar : 0);
        } 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;