return (ptr);
}
-void packed_to_token(long packed, char token[TOKLEN + 1])
-{
- // The advent->ascii mapping.
- const char advent_to_ascii[] = {
- ' ', '!', '"', '#', '$', '%', '&', '\'',
- '(', ')', '*', '+', ',', '-', '.', '/',
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', ':', ';', '<', '=', '>', '?',
- '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
- 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
- 'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
- };
-
- // Unpack and map back to ASCII.
- for (int i = 0; i < 5; ++i) {
- char advent = (packed >> i * 6) & 63;
- token[i] = 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[])
-{
- const char ascii_to_advent[] = {
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
-
- 0, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63,
-
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- };
-
- size_t t_len = strlen(token);
- if (t_len > TOKLEN)
- t_len = TOKLEN;
- long packed = 0;
- for (size_t i = 0; i < t_len; ++i) {
- char mapped = ascii_to_advent[(int) toupper(token[i])];
- packed |= (mapped << (6 * i));
- }
- return (packed);
-}
-
void tokenize(char* raw, struct command_t *cmd)
{
memset(cmd, '\0', sizeof(struct command_t));
* raw-input buffer as long as the enrire inout buffer. */
sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
- // pack the substrings
- cmd->wd1 = token_to_packed(cmd->raw1);
- cmd->wd2 = token_to_packed(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
}
}
-/* Hide the fact that wods are corrently packed longs */
-
-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, sspeak, get_input, yes) */
-void vspeak(const char* msg, bool blank, 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)
char* rendered = xmalloc(size);
char* renderp = rendered;
- // Handle format specifiers (including the custom %C, %L, %S) by
+ // Handle format specifiers (including the custom %S) by
// adjusting the parameter accordingly, and replacing the
// specifier with %s.
- long previous_arg = 0;
+ 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; // LCOV_EXCL_LINE - don't think we can get here.
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.
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--;
}
renderp += len;
size -= len;
}
-
- previous_arg = arg;
}
}
*renderp = 0;
/* 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 && (strlen(word) > 1 ||
+ if (strncasecmp(word, motions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 ||
strchr(ignore, word[0]) == NULL ||
!settings.oldstyle))
return (i);
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)
+ if (strncasecmp(word, objects[i].words.strs[j], TOKLEN) == 0)
return (i);
}
}
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 && (strlen(word) > 1 ||
+ if (strncasecmp(word, actions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 ||
strchr(ignore, word[0]) == NULL ||
!settings.oldstyle))
return (i);
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)
+ if (strncasecmp(word, specials[i].words.strs[j], TOKLEN) == 0)
return (i);
}
}
return (WORD_NOT_FOUND);
}
-long get_vocab_id(const char* word)
-// Search the vocab categories in order for the supplied word.
+void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
{
/* Check for an empty string */
- if (strncmp(word, "", sizeof("")) == 0)
- return (WORD_EMPTY);
+ if (strncmp(word, "", sizeof("")) == 0) {
+ *id = WORD_EMPTY;
+ *type = NO_WORD_TYPE;
+ return;
+ }
long ref_num;
- /* FIXME: Magic numbers related to vocabulary */
ref_num = get_motion_vocab_id(word);
- if (ref_num != WORD_NOT_FOUND)
- return MOTION_WORD(ref_num);
+ 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 OBJECT_WORD(ref_num);
+ 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)
- return ACTION_WORD(ref_num);
+ 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)
- return SPECIAL_WORD(ref_num);
+ if (ref_num != WORD_NOT_FOUND) {
+ *id = ref_num;
+ *type = SPECIAL;
+ return;
+ }
// Check for the reservoir magic word.
- if (strcasecmp(word, game.zzword) == 0)
- return ACTION_WORD(PART);
+ if (strcasecmp(word, game.zzword) == 0) {
+ *id = PART;
+ *type = ACTION;
+ return;
+ }
- return (WORD_NOT_FOUND);
+ *id = WORD_NOT_FOUND;
+ *type = NO_WORD_TYPE;
+ return;
}
void juggle(obj_t object)
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);
}
projects / open-adventure.git / blobdiff