projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c7ca4ee
)
Retrofit main.c for the new database and newspeak().
author
Jason S. Ninneman
<jsn@mbar.us>
Sun, 11 Jun 2017 18:51:12 +0000
(11:51 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Sun, 11 Jun 2017 22:42:25 +0000
(15:42 -0700)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 5f69f665355c7bb583b8031ec7806d160e4f48ff..06d43679760594dc3cf15aa289c35b6ed43a3e97 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,6
+21,7
@@
#include "advent.h"
#include "database.h"
#include "linenoise/linenoise.h"
#include "advent.h"
#include "database.h"
#include "linenoise/linenoise.h"
+#include "newdb.h"
struct game_t game;
struct game_t game;
@@
-709,9
+710,9
@@
static bool do_command(FILE *cmdin)
L2000: if (game.loc == 0)
croak(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. */
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;
}
croak(cmdin);
goto L2000;
}
-
KK=RTEXT
[16];
+
msg=arbitrary_messages
[16];
}
if (TOTING(BEAR))RSPEAK(141);
}
if (TOTING(BEAR))RSPEAK(141);
-
SPEAK(KK
);
+
newspeak(msg
);
K=1;
if (FORCED(game.loc)) {
goto L8;
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) {
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;
game.trnluz=game.trnluz+TRNVAL[game.trndex]/100000;
++game.trndex;
game.thresh = -1;