#include <stdarg.h>
#include <sys/time.h>
#include <ctype.h>
+#include <editline/readline.h>
#include "advent.h"
-#include "linenoise/linenoise.h"
-#include "newdb.h"
+#include "dungeon.h"
-char* xstrdup(const char* s)
+static void* xcalloc(size_t size)
{
- char* ptr = strdup(s);
- if (ptr == NULL) {
- // LCOV_EXCL_START
- // exclude from coverage analysis because we can't simulate an out of memory error in testing
- fprintf(stderr, "Out of memory!\n");
- exit(EXIT_FAILURE);
- }
- return(ptr);
-}
-
-void* xmalloc(size_t size)
-{
- void* ptr = malloc(size);
+ void* ptr = calloc(size, 1);
if (ptr == NULL) {
// LCOV_EXCL_START
// exclude from coverage analysis because we can't simulate an out of memory error in testing
fprintf(stderr, "Out of memory!\n");
exit(EXIT_FAILURE);
- // LCOV_EXCL_STOP
+ // LCOV_EXCL_STOP
}
return (ptr);
}
-void packed_to_token(long packed, char token[6])
-{
- // Unpack and map back to ASCII.
- for (int i = 0; i < 5; ++i) {
- char advent = (packed >> i * 6) & 63;
- token[i] = new_advent_to_ascii[(int) advent];
- }
-
- // Ensure the last character is \0.
- token[5] = '\0';
-
- // Replace trailing whitespace with \0.
- for (int i = 4; i >= 0; --i) {
- if (token[i] == ' ' || token[i] == '\t')
- token[i] = '\0';
- else
- break;
- }
-}
-
-long token_to_packed(const char token[6])
-{
- size_t t_len = strlen(token);
- long packed = 0;
- for (size_t i = 0; i < t_len; ++i)
- {
- char mapped = new_ascii_to_advent[(int) token[i]];
- packed |= (mapped << (6 * i));
- }
- return(packed);
-}
-
-void tokenize(char* raw, long tokens[4])
-{
- // set each token to 0
- for (int i = 0; i < 4; ++i)
- tokens[i] = 0;
-
- // grab the first two words
- char* words[2];
- words[0] = (char*) xmalloc(strlen(raw));
- words[1] = (char*) xmalloc(strlen(raw));
- int word_count = sscanf(raw, "%s%s", words[0], words[1]);
-
- // make space for substrings and zero it out
- char chunk_data[][6] = {
- {"\0\0\0\0\0"},
- {"\0\0\0\0\0"},
- {"\0\0\0\0\0"},
- {"\0\0\0\0\0"},
- };
-
- // break the words into up to 4 5-char substrings
- sscanf(words[0], "%5s%5s", chunk_data[0], chunk_data[1]);
- if (word_count == 2)
- sscanf(words[1], "%5s%5s", chunk_data[2], chunk_data[3]);
- free(words[0]);
- free(words[1]);
-
- // uppercase all the substrings
- for (int i = 0; i < 4; ++i)
- for (unsigned int j = 0; j < strlen(chunk_data[i]); ++j)
- chunk_data[i][j] = (char) toupper(chunk_data[i][j]);
-
- // pack the substrings
- for (int i = 0; i < 4; ++i)
- tokens[i] = token_to_packed(chunk_data[i]);
-}
-
-/* Hide the fact that wods are corrently packed longs */
+/* I/O routines (speak, pspeak, rspeak, sspeak, get_input, yes) */
-bool wordeq(token_t a, token_t b)
-{
- return a == b;
-}
-
-bool wordempty(token_t a)
-{
- return a == 0;
-}
-
-void wordclear(token_t *v)
-{
- *v = 0;
-}
-
-/* I/O routines (speak, pspeak, rspeak, GETIN, YES) */
-
-void vspeak(const char* msg, va_list ap)
+static void vspeak(const char* msg, bool blank, va_list ap)
{
// Do nothing if we got a null pointer.
if (msg == NULL)
if (strlen(msg) == 0)
return;
- // Print a newline if the global game.blklin says to.
- if (game.blklin == true)
+ if (blank == true)
printf("\n");
int msglen = strlen(msg);
// Rendered string
ssize_t size = 2000; /* msglen > 50 ? msglen*2 : 100; */
- char* rendered = xmalloc(size);
+ char* rendered = xcalloc(size);
char* renderp = rendered;
- // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s.
- long previous_arg = 0;
+ // Handle format specifiers (including the custom %S) by
+ // adjusting the parameter accordingly, and replacing the
+ // specifier with %s.
+ bool pluralize = false;
for (int i = 0; i < msglen; i++) {
if (msg[i] != '%') {
- *renderp++ = msg[i];
- size--;
+ /* Ugh. Least obtrusive way to deal with artifacts "on the floor"
+ * being dropped outside of both cave and building. */
+ if (strncmp(msg + i, "floor", 5) == 0 && strchr(" .", msg[i + 5]) && !INSIDE(game.loc)) {
+ strcpy(renderp, "ground");
+ renderp += 6;
+ i += 4;
+ size -= 5;
+ } else {
+ *renderp++ = msg[i];
+ size--;
+ }
} else {
- long arg = va_arg(ap, long);
- if (arg == -1)
- arg = 0;
i++;
- // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this.
+ // Integer specifier.
if (msg[i] == 'd') {
+ long arg = va_arg(ap, long);
int ret = snprintf(renderp, size, "%ld", arg);
if (ret < size) {
renderp += ret;
size -= ret;
}
+ pluralize = (arg != 1);
}
// Unmodified string specifier.
if (msg[i] == 's') {
- packed_to_token(arg, renderp); /* unpack directly to destination */
+ char *arg = va_arg(ap, char *);
+ strncat(renderp, arg, size - 1);
size_t len = strlen(renderp);
renderp += len;
size -= len;
// Singular/plural specifier.
if (msg[i] == 'S') {
- if (previous_arg > 1) { // look at the *previous* parameter (which by necessity must be numeric)
+ // look at the *previous* numeric parameter
+ if (pluralize) {
*renderp++ = 's';
size--;
}
}
- // All-lowercase specifier.
- if (msg[i] == 'L' || msg[i] == 'C') {
- packed_to_token(arg, renderp); /* unpack directly to destination */
- int len = strlen(renderp);
- for (int j = 0; j < len; ++j) {
- renderp[j] = tolower(renderp[j]);
- }
- if (msg[i] == 'C') // First char uppercase, rest lowercase.
- renderp[0] = toupper(renderp[0]);
+ /* Version specifier */
+ if (msg[i] == 'V') {
+ strcpy(renderp, VERSION);
+ size_t len = strlen(VERSION);
renderp += len;
size -= len;
}
-
- previous_arg = arg;
}
}
*renderp = 0;
{
va_list ap;
va_start(ap, msg);
- vspeak(msg, ap);
+ vspeak(msg, true, ap);
+ va_end(ap);
+}
+
+void sspeak(const int msg, ...)
+{
+ va_list ap;
+ va_start(ap, msg);
+ fputc('\n', stdout);
+ vprintf(arbitrary_messages[msg], ap);
+ fputc('\n', stdout);
va_end(ap);
}
-void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
+void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...)
/* Find the skip+1st message from msg and print it. Modes are:
* feel = for inventory, what you can touch
- * look = the long description for the state the object is in
+ * look = the full description for the state the object is in
* listen = the sound for the state the object is in
* study = text on the object. */
{
va_list ap;
- va_start(ap, skip);
+ va_start(ap, blank);
switch (mode) {
case touch:
- vspeak(objects[msg].inventory, ap);
- break;
- case look:
- vspeak(objects[msg].descriptions[skip], ap);
- break;
+ vspeak(objects[msg].inventory, blank, ap);
+ break;
+ case look:
+ vspeak(objects[msg].descriptions[skip], blank, ap);
+ break;
case hear:
- vspeak(objects[msg].sounds[skip], ap);
- break;
+ vspeak(objects[msg].sounds[skip], blank, ap);
+ break;
case study:
- vspeak(objects[msg].texts[skip], ap);
- break;
+ vspeak(objects[msg].texts[skip], blank, ap);
+ break;
case change:
- vspeak(objects[msg].changes[skip], ap);
- break;
+ vspeak(objects[msg].changes[skip], blank, ap);
+ break;
}
va_end(ap);
}
{
va_list ap;
va_start(ap, i);
- vspeak(arbitrary_messages[i], ap);
+ vspeak(arbitrary_messages[i], true, ap);
va_end(ap);
}
-void echo_input(FILE* destination, char* input_prompt, char* input)
+void echo_input(FILE* destination, const char* input_prompt, const char* input)
{
size_t len = strlen(input_prompt) + strlen(input) + 1;
- char* prompt_and_input = (char*) xmalloc(len);
+ char* prompt_and_input = (char*) xcalloc(len);
strcpy(prompt_and_input, input_prompt);
strcat(prompt_and_input, input);
fprintf(destination, "%s\n", prompt_and_input);
free(prompt_and_input);
}
-int word_count(char* s)
+static int word_count(char* str)
{
- char* copy = xstrdup(s);
- char delims[] = " \t";
- int count = 0;
- char* word;
-
- word = strtok(copy, delims);
- while(word != NULL)
- {
- word = strtok(NULL, delims);
- ++count;
- }
- free(copy);
- return(count);
+ char delims[] = " \t";
+ int count = 0;
+ int inblanks = true;
+
+ for (char *s = str; *s; s++)
+ if (inblanks) {
+ if (strchr(delims, *s) == 0) {
+ ++count;
+ inblanks = false;
+ }
+ } else {
+ if (strchr(delims, *s) != 0) {
+ inblanks = true;
+ }
+ }
+
+ return (count);
}
-char* get_input()
+static char* get_input(void)
{
// Set up the prompt
char input_prompt[] = "> ";
- if (!prompt)
+ if (!settings.prompt)
input_prompt[0] = '\0';
- // Print a blank line if game.blklin tells us to.
- if (game.blklin == true)
- printf("\n");
+ // Print a blank line
+ printf("\n");
char* input;
while (true) {
- if (editline)
- input = linenoise(input_prompt);
- else {
- input = NULL;
- size_t n = 0;
- if (isatty(0))
- // LCOV_EXCL_START
- // Should be unreachable in tests, as they will use a non-interactive shell.
- printf("%s", input_prompt);
- // LCOV_EXCL_STOP
- ssize_t numread = getline(&input, &n, stdin);
- if (numread == -1) // Got EOF; return with it.
- return(NULL);
- }
+ input = readline(input_prompt);
if (input == NULL) // Got EOF; return with it.
- return(input);
- else if (input[0] == '#') // Ignore comments.
+ return (input);
+ if (input[0] == '#') { // Ignore comments.
+ free(input);
continue;
- else // We have a 'normal' line; leave the loop.
- break;
+ }
+ // We have a 'normal' line; leave the loop.
+ break;
}
// Strip trailing newlines from the input
input[strcspn(input, "\n")] = 0;
- linenoiseHistoryAdd(input);
+ add_history(input);
if (!isatty(0))
echo_input(stdout, input_prompt, input);
- if (logfp)
- echo_input(logfp, input_prompt, input);
+ if (settings.logfp)
+ echo_input(settings.logfp, "", input);
return (input);
}
-bool silent_yes()
+bool silent_yes(void)
{
- char* reply;
- bool outcome;
-
- for (;;) {
- reply = get_input();
- if (reply == NULL) {
- // LCOV_EXCL_START
- // Should be unreachable. Reply should never be NULL
- linenoiseFree(reply);
- exit(EXIT_SUCCESS);
- // LCOV_EXCL_STOP
- }
+ bool outcome = false;
+
+ for (;;) {
+ char* reply = get_input();
+ if (reply == NULL) {
+ // LCOV_EXCL_START
+ // Should be unreachable. Reply should never be NULL
+ free(reply);
+ exit(EXIT_SUCCESS);
+ // LCOV_EXCL_STOP
+ }
+ if (strlen(reply) == 0) {
+ free(reply);
+ rspeak(PLEASE_ANSWER);
+ continue;
+ }
+
+ char* firstword = (char*) xcalloc(strlen(reply) + 1);
+ sscanf(reply, "%s", firstword);
+
+ free(reply);
+
+ for (int i = 0; i < (int)strlen(firstword); ++i)
+ firstword[i] = tolower(firstword[i]);
+
+ int yes = strncmp("yes", firstword, sizeof("yes") - 1);
+ int y = strncmp("y", firstword, sizeof("y") - 1);
+ int no = strncmp("no", firstword, sizeof("no") - 1);
+ int n = strncmp("n", firstword, sizeof("n") - 1);
+
+ free(firstword);
- char* firstword = (char*) xmalloc(strlen(reply)+1);
- sscanf(reply, "%s", firstword);
-
- for (int i = 0; i < (int)strlen(firstword); ++i)
- firstword[i] = tolower(firstword[i]);
-
- int yes = strncmp("yes", firstword, sizeof("yes") - 1);
- int y = strncmp("y", firstword, sizeof("y") - 1);
- int no = strncmp("no", firstword, sizeof("no") - 1);
- int n = strncmp("n", firstword, sizeof("n") - 1);
-
- free(firstword);
-
- if (yes == 0 || y == 0) {
- outcome = true;
- break;
- } else if (no == 0 || n == 0) {
- outcome = false;
- break;
- } else
- rspeak(PLEASE_ANSWER);
- }
- linenoiseFree(reply);
- return (outcome);
+ if (yes == 0 ||
+ y == 0) {
+ outcome = true;
+ break;
+ } else if (no == 0 ||
+ n == 0) {
+ outcome = false;
+ break;
+ } else
+ rspeak(PLEASE_ANSWER);
+ }
+ return (outcome);
}
/* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */
{
- char* reply;
- bool outcome;
+ bool outcome = false;
for (;;) {
speak(question);
- reply = get_input();
+ char* reply = get_input();
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
- linenoiseFree(reply);
+ free(reply);
exit(EXIT_SUCCESS);
- // LCOV_EXCL_STOP
+ // LCOV_EXCL_STOP
+ }
+
+ if (strlen(reply) == 0) {
+ free(reply);
+ rspeak(PLEASE_ANSWER);
+ continue;
}
- char* firstword = (char*) xmalloc(strlen(reply)+1);
+ char* firstword = (char*) xcalloc(strlen(reply) + 1);
sscanf(reply, "%s", firstword);
+ free(reply);
+
for (int i = 0; i < (int)strlen(firstword); ++i)
firstword[i] = tolower(firstword[i]);
free(firstword);
- if (yes == 0 || y == 0) {
- speak(yes_response);
+ if (yes == 0 ||
+ y == 0) {
+ speak(yes_response);
outcome = true;
break;
- } else if (no == 0 || n == 0) {
+ } else if (no == 0 ||
+ n == 0) {
speak(no_response);
outcome = false;
break;
} else
rspeak(PLEASE_ANSWER);
+
}
- linenoiseFree(reply);
+
return (outcome);
}
/* Data structure routines */
-int get_motion_vocab_id(const char* word)
+static int get_motion_vocab_id(const char* word)
// Return the first motion number that has 'word' as one of its words.
{
- for (int i = 0; i < NMOTIONS; ++i)
- {
- for (int j = 0; j < motions[i].words.n; ++j)
- {
- if (strcasecmp(word, motions[i].words.strs[j]) == 0)
- return(i);
- }
+ for (int i = 0; i < NMOTIONS; ++i) {
+ for (int j = 0; j < motions[i].words.n; ++j) {
+ if (strncasecmp(word, motions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 ||
+ strchr(ignore, word[0]) == NULL ||
+ !settings.oldstyle))
+ return (i);
+ }
}
- // If execution reaches here, we didn't find the word.
- return(WORD_NOT_FOUND);
+ // If execution reaches here, we didn't find the word.
+ return (WORD_NOT_FOUND);
}
-int get_object_vocab_id(const char* word)
+static int get_object_vocab_id(const char* word)
// Return the first object number that has 'word' as one of its words.
{
- for (int i = 0; i < NOBJECTS + 1; ++i) // FIXME: the + 1 should go when 1-indexing for objects is removed
- {
- for (int j = 0; j < objects[i].words.n; ++j)
- {
- if (strcasecmp(word, objects[i].words.strs[j]) == 0)
- return(i);
- }
+ for (int i = 0; i < NOBJECTS + 1; ++i) { // FIXME: the + 1 should go when 1-indexing for objects is removed
+ for (int j = 0; j < objects[i].words.n; ++j) {
+ if (strncasecmp(word, objects[i].words.strs[j], TOKLEN) == 0)
+ return (i);
+ }
}
- // If execution reaches here, we didn't find the word.
- return(WORD_NOT_FOUND);
+ // If execution reaches here, we didn't find the word.
+ return (WORD_NOT_FOUND);
}
-int get_action_vocab_id(const char* word)
+static int get_action_vocab_id(const char* word)
// Return the first motion number that has 'word' as one of its words.
{
- for (int i = 0; i < NACTIONS; ++i)
- {
- for (int j = 0; j < actions[i].words.n; ++j)
- {
- if (strcasecmp(word, actions[i].words.strs[j]) == 0)
- return(i);
- }
+ for (int i = 0; i < NACTIONS; ++i) {
+ for (int j = 0; j < actions[i].words.n; ++j) {
+ if (strncasecmp(word, actions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 ||
+ strchr(ignore, word[0]) == NULL ||
+ !settings.oldstyle))
+ return (i);
+ }
}
- // If execution reaches here, we didn't find the word.
- return(WORD_NOT_FOUND);
+ // If execution reaches here, we didn't find the word.
+ return (WORD_NOT_FOUND);
}
-int get_special_vocab_id(const char* word)
+static int get_special_vocab_id(const char* word)
// Return the first special number that has 'word' as one of its words.
{
- for (int i = 0; i < NSPECIALS; ++i)
- {
- for (int j = 0; j < specials[i].words.n; ++j)
- {
- if (strcasecmp(word, specials[i].words.strs[j]) == 0)
- return(i);
- }
+ for (int i = 0; i < NSPECIALS; ++i) {
+ for (int j = 0; j < specials[i].words.n; ++j) {
+ if (strncasecmp(word, specials[i].words.strs[j], TOKLEN) == 0)
+ return (i);
+ }
}
- // If execution reaches here, we didn't find the word.
- return(WORD_NOT_FOUND);
+ // If execution reaches here, we didn't find the word.
+ return (WORD_NOT_FOUND);
}
-long get_vocab_id(const char* word)
-// Search the vocab categories in order for the supplied word.
+static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type)
{
- long ref_num;
-
- ref_num = get_motion_vocab_id(word);
- if (ref_num != WORD_NOT_FOUND)
- return(ref_num + 0); // FIXME: replace with a proper hash
+ /* Check for an empty string */
+ if (strncmp(word, "", sizeof("")) == 0) {
+ *id = WORD_EMPTY;
+ *type = NO_WORD_TYPE;
+ return;
+ }
+
+ vocab_t ref_num;
+
+ ref_num = get_motion_vocab_id(word);
+ if (ref_num != WORD_NOT_FOUND) {
+ *id = ref_num;
+ *type = MOTION;
+ return;
+ }
- ref_num = get_object_vocab_id(word);
- if (ref_num != WORD_NOT_FOUND)
- return(ref_num + 1000); // FIXME: replace with a proper hash
+ ref_num = get_object_vocab_id(word);
+ if (ref_num != WORD_NOT_FOUND) {
+ *id = ref_num;
+ *type = OBJECT;
+ return;
+ }
+
+ ref_num = get_action_vocab_id(word);
+ if (ref_num != WORD_NOT_FOUND) {
+ *id = ref_num;
+ *type = ACTION;
+ return;
+ }
+
+ ref_num = get_special_vocab_id(word);
+ if (ref_num != WORD_NOT_FOUND) {
+ *id = ref_num;
+ *type = SPECIAL;
+ return;
+ }
+
+ // Check for the reservoir magic word.
+ if (strcasecmp(word, game.zzword) == 0) {
+ *id = PART;
+ *type = ACTION;
+ return;
+ }
- ref_num = get_action_vocab_id(word);
- if (ref_num != WORD_NOT_FOUND)
- return(ref_num + 2000); // FIXME: replace with a proper hash
+ *id = WORD_NOT_FOUND;
+ *type = NO_WORD_TYPE;
+ return;
+}
- ref_num = get_special_vocab_id(word);
- if (ref_num != WORD_NOT_FOUND)
- return(ref_num + 3000); // FIXME: replace with a proper hash
+static void tokenize(char* raw, struct command_t *cmd)
+{
+ memset(cmd, '\0', sizeof(struct command_t));
- // Check for the reservoir magic word.
- if (strcasecmp(word, game.zzword) == 0)
- return(PART + 2000); // FIXME: replace with a proper hash
+ /* Bound prefix on the %s would be needed to prevent buffer
+ * overflow. but we shortstop this more simply by making each
+ * raw-input buffer as long as the entire input buffer. */
+ sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
+
+ /* (ESR) In oldstyle mode, simulate the uppercasing and truncating
+ * effect on raw tokens of packing them into sixbit characters, 5
+ * to a 32-bit word. This is something the FORTRAN version did
+ * becuse archaic FORTRAN had no string types. Don Wood's
+ * mechanical translation of 2.5 to C retained the packing and
+ * thus this misfeature.
+ *
+ * It's philosophically questionable whether this is the right
+ * thing to do even in oldstyle mode. On one hand, the text
+ * mangling was not authorial intent, but a result of limitations
+ * in their tools. On the other, not simulating this misbehavior
+ * goes against the goal of making oldstyle as accurate as
+ * possible an emulation of the original UI.
+ */
+ if (settings.oldstyle) {
+ cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0';
+ for (size_t i = 0; i < strlen(cmd->raw1); i++)
+ cmd->raw1[i] = toupper(cmd->raw1[i]);
+ for (size_t i = 0; i < strlen(cmd->raw2); i++)
+ cmd->raw2[i] = toupper(cmd->raw2[i]);
+ }
- return(WORD_NOT_FOUND);
+ /* populate command with parsed vocabulary metadata */
+ get_vocab_metadata(cmd->raw1, &(cmd->id1), &(cmd->type1));
+ get_vocab_metadata(cmd->raw2, &(cmd->id2), &(cmd->type2));
}
-void juggle(long object)
+bool get_command_input(struct command_t *command)
+/* Get user input on stdin, parse and map to command */
+{
+ char inputbuf[LINESIZE];
+ char* input;
+
+ for (;;) {
+ input = get_input();
+ if (input == NULL)
+ return false;
+ if (word_count(input) > 2) {
+ rspeak(TWO_WORDS);
+ free(input);
+ continue;
+ }
+ if (strcmp(input, "") != 0)
+ break;
+ free(input);
+ }
+
+ strncpy(inputbuf, input, LINESIZE - 1);
+ free(input);
+
+ tokenize(inputbuf, command);
+
+ return true;
+}
+
+void juggle(obj_t object)
/* Juggle an object by picking it up and putting it down again, the purpose
* being to get the object to the front of the chain of things at its loc. */
{
- long i, j;
+ loc_t i, j;
i = game.place[object];
j = game.fixed[object];
move(object + NOBJECTS, j);
}
-void move(long object, long where)
+void move(obj_t object, loc_t where)
/* Place any object anywhere by picking it up and dropping it. May
* already be toting, in which case the carry is a no-op. Mustn't
* pick up objects which are not at any loc, since carry wants to
* remove objects from game.atloc chains. */
{
- long from;
+ loc_t from;
if (object > NOBJECTS)
from = game.fixed[object - NOBJECTS];
else
from = game.place[object];
- if (from != LOC_NOWHERE && from != CARRIED && !SPECIAL(from))
+ /* (ESR) Used to check for !SPECIAL(from). I *think* that was wrong... */
+ if (from != LOC_NOWHERE && from != CARRIED)
carry(object, from);
drop(object, where);
}
-long put(long object, long where, long pval)
-/* PUT is the same as MOVE, except it returns a value used to set up the
+loc_t put(obj_t object, loc_t where, long pval)
+/* put() is the same as move(), except it returns a value used to set up the
* negated game.prop values for the repository objects. */
{
move(object, where);
- return (-1) - pval;;
+ return STASHED(pval);
}
-void carry(long object, long where)
+void carry(obj_t object, loc_t where)
/* Start toting an object, removing it from the list of things at its former
* location. Incr holdng unless it was already being toted. If object>NOBJECTS
* (moving "fixed" second loc), don't change game.place or game.holdng. */
game.link[temp] = game.link[object];
}
-void drop(long object, long where)
+void drop(obj_t object, loc_t where)
/* Place an object at a given loc, prefixing it onto the game.atloc list. Decr
* game.holdng if the object was being toted. */
{
--game.holdng;
game.place[object] = where;
}
- if (where <= 0)
+ if (where == LOC_NOWHERE ||
+ where == CARRIED)
return;
game.link[object] = game.atloc[where];
game.atloc[where] = object;
}
-long atdwrf(long where)
+int atdwrf(loc_t where)
/* Return the index of first dwarf at the given location, zero if no dwarf is
* there (or if dwarves not active yet), -1 if all dwarves are dead. Ignore
* the pirate (6th dwarf). */
{
- long at;
+ int at;
at = 0;
if (game.dflag < 2)
- return (at);
+ return at;
at = -1;
for (long i = 1; i <= NDWARVES - 1; i++) {
if (game.dloc[i] == where)
if (game.dloc[i] != 0)
at = 0;
}
- return (at);
+ return at;
}
-/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
- * randrange, RNDVOC) */
+/* Utility routines (setbit, tstbit, set_seed, get_next_lcg_value,
+ * randrange) */
-long setbit(long bit)
+long setbit(int bit)
/* Returns 2**bit for use in constructing bit-masks. */
{
return (1L << bit);
/* Set the LCG seed */
{
game.lcg_x = (unsigned long) seedval % game.lcg_m;
+
+ // once seed is set, we need to generate the Z`ZZZ word
+ for (int i = 0; i < 5; ++i) {
+ game.zzword[i] = 'A' + randrange(26);
+ }
+ game.zzword[1] = '\''; // force second char to apostrophe
+ game.zzword[5] = '\0';
}
unsigned long get_next_lcg_value(void)
return range * get_next_lcg_value() / game.lcg_m;
}
-void make_zzword(char zzword[6])
-{
- for (int i = 0; i < 5; ++i)
- {
- zzword[i] = 'A' + randrange(26);
- }
- zzword[1] = '\''; // force second char to apostrophe
- zzword[5] = '\0';
-}
-
-/* Machine dependent routines (MAPLIN, SAVEIO) */
-
-bool MAPLIN(FILE *fp)
-{
- bool eof;
-
- /* Read a line of input, from the specified input source.
- * This logic is complicated partly because it has to serve
- * several cases with different requirements and partly because
- * of a quirk in linenoise().
- *
- * The quirk shows up when you paste a test log from the clipboard
- * to the program's command prompt. While fgets (as expected)
- * consumes it a line at a time, linenoise() returns the first
- * line and discards the rest. Thus, there needs to be an
- * editline (-s) option to fall back to fgets while still
- * prompting. Note that linenoise does behave properly when
- * fed redirected stdin.
- *
- * The logging is a bit of a mess because there are two distinct cases
- * in which you want to echo commands. One is when shipping them to
- * a log under the -l option, in which case you want to suppress
- * prompt generation (so test logs are unadorned command sequences).
- * On the other hand, if you redirected stdin and are feeding the program
- * a logfile, you *do* want prompt generation - it makes checkfiles
- * easier to read when the commands are marked by a preceding prompt.
- */
- do {
- if (!editline) {
- if (prompt)
- fputs("> ", stdout);
- IGNORE(fgets(rawbuf, sizeof(rawbuf) - 1, fp));
- eof = (feof(fp));
- } else {
- char *cp = linenoise("> ");
- eof = (cp == NULL);
- if (!eof) {
- strncpy(rawbuf, cp, sizeof(rawbuf) - 1);
- linenoiseHistoryAdd(rawbuf);
- strncat(rawbuf, "\n", sizeof(rawbuf) - strlen(rawbuf) - 1);
- linenoiseFree(cp);
- }
- }
- } while
- (!eof && rawbuf[0] == '#');
- if (eof) {
- if (logfp && fp == stdin)
- fclose(logfp);
- return false;
- } else {
- FILE *efp = NULL;
- if (logfp && fp == stdin)
- efp = logfp;
- else if (!isatty(0))
- efp = stdout;
- if (efp != NULL) {
- if (prompt && efp == stdout)
- fputs("> ", efp);
- IGNORE(fputs(rawbuf, efp));
- }
- strcpy(INLINE + 1, rawbuf);
- /* translate the chars to integers in the range 0-126 and store
- * them in the common array "INLINE". Integer values are as follows:
- * 0 = space [ASCII CODE 40 octal, 32 decimal]
- * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal]
- * 3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal]
- * 11-36 = upper-case letters
- * 37-62 = lower-case letters
- * 63 = percent (%) [ASCII 45 octal, 37 decimal]
- * 64-73 = digits, 0 through 9
- * Remaining characters can be translated any way that is convenient;
- * The above mappings are required so that certain special
- * characters are known to fit in 6 bits and/or can be easily spotted.
- * Array elements beyond the end of the line should be filled with 0,
- * and LNLENG should be set to the index of the last character.
- *
- * If the data file uses a character other than space (e.g., tab) to
- * separate numbers, that character should also translate to 0.
- *
- * This procedure may use the map1,map2 arrays to maintain
- * static data for he mapping. MAP2(1) is set to 0 when the
- * program starts and is not changed thereafter unless the
- * routines in this module choose to do so. */
- LNLENG = 0;
- for (long i = 1; i <= (long)sizeof(INLINE) && INLINE[i] != 0; i++) {
- long val = INLINE[i];
- INLINE[i] = ascii_to_advent[val];
- if (INLINE[i] != 0)
- LNLENG = i;
- }
- LNPOSN = 1;
- return true;
- }
-}
-
-void datime(long* d, long* t)
-{
- struct timeval tv;
- gettimeofday(&tv, NULL);
- *d = (long) tv.tv_sec;
- *t = (long) tv.tv_usec;
-}
-
// LCOV_EXCL_START
void bug(enum bugtype num, const char *error_string)
{
// LCOV_EXCL_STOP
/* end */
+
+void state_change(obj_t obj, int state)
+/* Object must have a change-message list for this to be useful; only some do */
+{
+ game.prop[obj] = state;
+ pspeak(obj, change, state, true);
+}
+
+/* end */
projects / open-adventure.git / blobdiff