projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coverage improvement. Also, it's rude to die silently.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 23c053f2e41a7b91f41e1ebda1b154361e6629c9..0e6b50e535b6365f7457ec0d50d59aa50edbc929 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-1,3
+1,11
@@
+/*
+ * I/O and support riutines.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@
-6,6
+14,7
@@
#include <sys/time.h>
#include <ctype.h>
#include <editline/readline.h>
#include <sys/time.h>
#include <ctype.h>
#include <editline/readline.h>
+#include <inttypes.h>
#include "advent.h"
#include "dungeon.h"
#include "advent.h"
#include "dungeon.h"
@@
-66,8
+75,8
@@
static void vspeak(const char* msg, bool blank, va_list ap)
i++;
// Integer specifier.
if (msg[i] == 'd') {
i++;
// Integer specifier.
if (msg[i] == 'd') {
-
long arg = va_arg(ap, long
);
- int ret = snprintf(renderp, size, "%
ld"
, arg);
+
int32_t arg = va_arg(ap, int32_t
);
+ int ret = snprintf(renderp, size, "%
" PRId32
, arg);
if (ret < size) {
renderp += ret;
size -= ret;
if (ret < size) {
renderp += ret;
size -= ret;
@@
-388,22
+397,21
@@
static int get_action_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
return (WORD_NOT_FOUND);
}
-static bool is_valid_int(const char *str)
-/* Returns true if the string passed in is represents a valid integer,
+static bool is_valid_int(const char *str)
+/* Returns true if the string passed in is represents a valid integer,
* that could then be parsed by atoi() */
{
// Handle negative number
if (*str == '-')
++str;
* that could then be parsed by atoi() */
{
// Handle negative number
if (*str == '-')
++str;
- // Handle empty string or just "-". Should never reach this
+ // Handle empty string or just "-". Should never reach this
// point, because this is only used with transitive verbs.
if (!*str)
return false; // LCOV_EXCL_LINE
// Check for non-digit chars in the rest of the stirng.
// point, because this is only used with transitive verbs.
if (!*str)
return false; // LCOV_EXCL_LINE
// Check for non-digit chars in the rest of the stirng.
- while (*str)
- {
+ while (*str) {
if (!isdigit(*str))
return false;
else
if (!isdigit(*str))
return false;
else
@@
-464,14
+472,19
@@
static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
return;
}
return;
}
-static void tokenize(char* raw,
struct
command_t *cmd)
+static void tokenize(char* raw, command_t *cmd)
{
{
- memset(cmd, '\0', sizeof(struct command_t));
+ /*
+ * Be caereful about modifing this. We do not want to nuke the
+ * the speech part or ID from the previous turn.
+ */
+ memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0],raw));
+ memset(&cmd->word[1].raw, '\0', sizeof(cmd->word[1].raw));
/* 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. */
/* 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
);
+ sscanf(raw, "%s%s", cmd->
word[0].raw, cmd->word[1].raw
);
/* (ESR) In oldstyle mode, simulate the uppercasing and truncating
* effect on raw tokens of packing them into sixbit characters, 5
/* (ESR) In oldstyle mode, simulate the uppercasing and truncating
* effect on raw tokens of packing them into sixbit characters, 5
@@
-488,19
+501,19
@@
static void tokenize(char* raw, struct command_t *cmd)
* possible an emulation of the original UI.
*/
if (settings.oldstyle) {
* 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]);
+ cmd->
word[0].raw[TOKLEN + TOKLEN] = cmd->word[1].raw
[TOKLEN + TOKLEN] = '\0';
+ for (size_t i = 0; i < strlen(cmd->
word[0].raw
); i++)
+ cmd->
word[0].raw[i] = toupper(cmd->word[0].raw
[i]);
+ for (size_t i = 0; i < strlen(cmd->
word[1].raw
); i++)
+ cmd->
word[1].raw[i] = toupper(cmd->word[1].raw
[i]);
}
/* populate command with parsed vocabulary metadata */
}
/* populate command with parsed vocabulary metadata */
- get_vocab_metadata(cmd->
raw1, &(cmd->id1), &(cmd->type1
));
- get_vocab_metadata(cmd->
raw2, &(cmd->id2), &(cmd->type2
));
+ get_vocab_metadata(cmd->
word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type
));
+ get_vocab_metadata(cmd->
word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type
));
}
}
-bool get_command_input(
struct
command_t *command)
+bool get_command_input(command_t *command)
/* Get user input on stdin, parse and map to command */
{
char inputbuf[LINESIZE];
/* Get user input on stdin, parse and map to command */
{
char inputbuf[LINESIZE];
@@
-577,7
+590,9
@@
void carry(obj_t object, loc_t where)
if (game.place[object] == CARRIED)
return;
game.place[object] = CARRIED;
if (game.place[object] == CARRIED)
return;
game.place[object] = CARRIED;
- ++game.holdng;
+
+ if (object!= BIRD)
+ ++game.holdng;
}
if (game.atloc[where] == object) {
game.atloc[where] = game.link[object];
}
if (game.atloc[where] == object) {
game.atloc[where] = game.link[object];
@@
-598,7
+613,14
@@
void drop(obj_t object, loc_t where)
game.fixed[object - NOBJECTS] = where;
else {
if (game.place[object] == CARRIED)
game.fixed[object - NOBJECTS] = where;
else {
if (game.place[object] == CARRIED)
- --game.holdng;
+ if (object != BIRD)
+ /* The bird has to be weightless. This ugly hack (and the
+ * corresponding code in the drop function) brought to you
+ * by the fact that when the bird is caged, we need to be able
+ * to either 'take bird' or 'take cage' and have the right thing
+ * happen.
+ */
+ --game.holdng;
game.place[object] = where;
}
if (where == LOC_NOWHERE ||
game.place[object] = where;
}
if (where == LOC_NOWHERE ||
@@
-643,11
+665,13
@@
bool tstbit(long mask, int bit)
return (mask & (1 << bit)) != 0;
}
return (mask & (1 << bit)) != 0;
}
-void set_seed(
long
seedval)
+void set_seed(
int32_t
seedval)
/* Set the LCG seed */
{
/* Set the LCG seed */
{
- game.lcg_x = (unsigned long) seedval % game.lcg_m;
-
+ game.lcg_x = seedval % LCG_M;
+ if (game.lcg_x < 0) {
+ game.lcg_x = LCG_M + game.lcg_x;
+ }
// 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);
// 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);
@@
-656,18
+680,18
@@
void set_seed(long seedval)
game.zzword[5] = '\0';
}
game.zzword[5] = '\0';
}
-static
unsigned long
get_next_lcg_value(void)
+static
int32_t
get_next_lcg_value(void)
/* Return the LCG's current value, and then iterate it. */
{
/* Return the LCG's current value, and then iterate it. */
{
-
unsigned long
old_x = game.lcg_x;
- game.lcg_x = (
game.lcg_a * game.lcg_x + game.lcg_c) % game.lcg_m
;
+
int32_t
old_x = game.lcg_x;
+ game.lcg_x = (
LCG_A * game.lcg_x + LCG_C) % LCG_M
;
return old_x;
}
return old_x;
}
-
long randrange(long
range)
+
int32_t randrange(int32_t
range)
/* Return a random integer from [0, range). */
{
/* Return a random integer from [0, range). */
{
- return range * get_next_lcg_value() /
game.lcg_m
;
+ return range * get_next_lcg_value() /
LCG_M
;
}
// LCOV_EXCL_START
}
// LCOV_EXCL_START