archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved application settings to settings_t struct

Browse source 
Since logfp, oldstyle, and prompt were application settings, rather than
have them all as global vars, move them to a single global var, seperate
from game state, as they aren't, technically, game state, but are
application settings.
This commit is contained in:
Aaron Traas 2017-07-02 02:46:04 -04:00 • committed by Eric S. Raymond
parent d23111daba
commit 7eaefce61d
5 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
misc.c
View file

@ -325,7 +325,7 @@ char* get_input()
{
// 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.
@ -353,8 +353,8 @@ char* get_input()
if (!isatty(0))
echo_input(stdout, input_prompt, input);
if (logfp)
echo_input(logfp, "", input);
if (settings.logfp)
echo_input(settings.logfp, "", input);
return (input);
}
@ -459,7 +459,7 @@ int get_motion_vocab_id(const char* word)
{
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 || strchr(ignore, word[0]) == NULL || !oldstyle))
if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
return (i);
}
}
@ -485,7 +485,7 @@ int get_action_vocab_id(const char* word)
{
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 || strchr(ignore, word[0]) == NULL || !oldstyle))
if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
return (i);
}
}