projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved application settings to settings_t struct
[open-adventure.git]
/
init.c
diff --git
a/init.c
b/init.c
index 0f81fe15cb52e79fdc2692a9e8d9d005f19c9af9..5372714566f336ddd0e65090ea5afee59f94195b 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-10,6
+10,12
@@
* Initialisation
*/
* Initialisation
*/
+struct settings_t settings = {
+ .logfp = NULL,
+ .oldstyle = false,
+ .prompt = true
+};
+
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
.dloc[2] = LOC_WESTBANK,
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
.dloc[2] = LOC_WESTBANK,
@@
-41,7
+47,7
@@
struct game_t game = {
long initialise(void)
{
long initialise(void)
{
- if (oldstyle)
+ if (
settings.
oldstyle)
printf("Initialising...\n");
srand(time(NULL));
printf("Initialising...\n");
srand(time(NULL));
@@
-92,8
+98,5
@@
long initialise(void)
}
game.conds = setbit(11);
}
game.conds = setbit(11);
- /* Start-up, dwarf stuff */
- make_zzword(game.zzword);
-
return seedval;
}
return seedval;
}