projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debris from a misclick.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 1e2a1fd68722f850afdb45a80588cc344fc53ac0..306ce73508ce03835c3fc57accb65cf76b31756f 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,14
+21,12
@@
#include <signal.h>
#include <string.h>
#include "advent.h"
#include <signal.h>
#include <string.h>
#include "advent.h"
-#include "linenoise/linenoise.h"
#include "dungeon.h"
#define DIM(a) (sizeof(a)/sizeof(a[0]))
FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false;
#include "dungeon.h"
#define DIM(a) (sizeof(a)/sizeof(a[0]))
FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false;
-bool editline = true;
bool prompt = true;
// LCOV_EXCL_START
bool prompt = true;
// LCOV_EXCL_START
@@
-47,7
+45,6
@@
static void sig_handler(int signo)
* MAIN PROGRAM
*
* Adventure (rev 2: 20 treasures)
* MAIN PROGRAM
*
* Adventure (rev 2: 20 treasures)
-Here's what we think. *
* History: Original idea & 5-treasure version (adventures) by Willie Crowther
* 15-treasure version (adventure) by Don Woods, April-June 1977
* 20-treasure version (rev 2) by Don Woods, August 1978
* History: Original idea & 5-treasure version (adventures) by Willie Crowther
* 15-treasure version (adventure) by Don Woods, April-June 1977
* 20-treasure version (rev 2) by Don Woods, August 1978
@@
-64,11
+61,11
@@
int main(int argc, char *argv[])
/* Options. */
#ifndef ADVENT_NOSAVE
/* Options. */
#ifndef ADVENT_NOSAVE
- const char* opts = "l:or
:s
";
- const char* usage = "Usage: %s [-l logfilename] [-o] [-r restorefilename]
[-s]
\n";
+ const char* opts = "l:or";
+ const char* usage = "Usage: %s [-l logfilename] [-o] [-r restorefilename]\n";
#else
#else
- const char* opts = "l:o
s
";
- const char* usage = "Usage: %s [-l logfilename] [-o]
[-s]
\n";
+ const char* opts = "l:o";
+ const char* usage = "Usage: %s [-l logfilename] [-o]\n";
#endif
while ((ch = getopt(argc, argv, opts)) != EOF) {
switch (ch) {
#endif
while ((ch = getopt(argc, argv, opts)) != EOF) {
switch (ch) {
@@
-82,7
+79,7
@@
int main(int argc, char *argv[])
break;
case 'o':
oldstyle = true;
break;
case 'o':
oldstyle = true;
-
editline =
prompt = false;
+ prompt = false;
break;
#ifndef ADVENT_NOSAVE
case 'r':
break;
#ifndef ADVENT_NOSAVE
case 'r':
@@
-94,9
+91,6
@@
int main(int argc, char *argv[])
signal(SIGINT, sig_handler);
break;
#endif
signal(SIGINT, sig_handler);
break;
#endif
- case 's':
- editline = false;
- break;
default:
fprintf(stderr,
usage, argv[0]);
default:
fprintf(stderr,
usage, argv[0]);
@@
-108,20
+102,18
@@
int main(int argc, char *argv[])
fprintf(stderr,
" -r restore from specified saved game file\n");
#endif
fprintf(stderr,
" -r restore from specified saved game file\n");
#endif
- fprintf(stderr,
- " -s suppress command editing\n");
exit(EXIT_FAILURE);
break;
}
}
exit(EXIT_FAILURE);
break;
}
}
- linenoiseHistorySetMaxLen(350);
-
/* Initialize game variables */
long seedval = initialise();
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
/* Initialize game variables */
long seedval = initialise();
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
+
+#ifndef ADVENT_NOSAVE
if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice)
if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice)
@@
-129,6
+121,7
@@
int main(int argc, char *argv[])
} else {
restore(rfp);
}
} else {
restore(rfp);
}
+#endif
if (logfp)
fprintf(logfp, "seed %ld\n", seedval);
if (logfp)
fprintf(logfp, "seed %ld\n", seedval);
@@
-776,8
+769,8
@@
static bool closecheck(void)
juggle(CHASM);
if (game.prop[BEAR] != BEAR_DEAD)
DESTROY(BEAR);
juggle(CHASM);
if (game.prop[BEAR] != BEAR_DEAD)
DESTROY(BEAR);
- game.prop[CHAIN] =
0
;
- game.fixed[CHAIN] =
0
;
+ game.prop[CHAIN] =
CHAIN_HEAP
;
+ game.fixed[CHAIN] =
CHAIN_HEAP
;
game.prop[AXE] = 0;
game.fixed[AXE] = 0;
rspeak(CAVE_CLOSING);
game.prop[AXE] = 0;
game.fixed[AXE] = 0;
rspeak(CAVE_CLOSING);
@@
-879,8
+872,8
@@
static void listobjects(void)
/* Print out descriptions of objects at this location. If
* not closing and property value is negative, tally off
* another treasure. Rug is special case; once seen, its
/* Print out descriptions of objects at this location. If
* not closing and property value is negative, tally off
* another treasure. Rug is special case; once seen, its
- * game.prop is
1
(dragon on it) till dragon is killed.
- * Similarly for chain; game.prop is initially
1
(locked to
+ * game.prop is
RUG_DRAGON
(dragon on it) till dragon is killed.
+ * Similarly for chain; game.prop is initially
CHAINING_BEAR
(locked to
* bear). These hacks are because game.prop=0 is needed to
* get full score. */
{
* bear). These hacks are because game.prop=0 is needed to
* get full score. */
{
@@
-896,8
+889,10
@@
static void listobjects(void)
if (game.closed)
continue;
game.prop[obj] = 0;
if (game.closed)
continue;
game.prop[obj] = 0;
- if (obj == RUG || obj == CHAIN)
- game.prop[obj] = 1;
+ if (obj == RUG)
+ game.prop[RUG] = RUG_DRAGON;
+ if (obj == CHAIN)
+ game.prop[CHAIN] = CHAINING_BEAR;
--game.tally;
/* Note: There used to be a test here to see whether the
* player had blown it so badly that he could never ever see
--game.tally;
/* Note: There used to be a test here to see whether the
* player had blown it so badly that he could never ever see
@@
-1033,7
+1028,7
@@
L2600:
}
strncpy(inputbuf, input, LINESIZE - 1);
}
strncpy(inputbuf, input, LINESIZE - 1);
-
linenoiseF
ree(input);
+
f
ree(input);
long tokens[4];
tokenize(inputbuf, tokens);
long tokens[4];
tokenize(inputbuf, tokens);
@@
-1090,12
+1085,12
@@
L2607:
wordclear(&command.wd2);
} else {
/* FIXME: Magic numbers related to vocabulary */
wordclear(&command.wd2);
} else {
/* FIXME: Magic numbers related to vocabulary */
- if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
- (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
- if (AT(DEMOTE_WORD(V2)))
+
if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
+
(V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
+
if (AT(DEMOTE_WORD(V2)))
command.wd2 = token_to_packed("POUR");
}
command.wd2 = token_to_packed("POUR");
}
- if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
+
if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH");
}
L2620:
command.wd1 = token_to_packed("CATCH");
}
L2620: