diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
commit | e1273e8666e5c03c36b55a4fec80f6f76270ee10 (patch) | |
tree | a665761c61de01b26fc98714c7290dcfdd3fd0da /src | |
parent | 6c62afae8ef0bb96866afd221d0fb7cbc2c7a9af (diff) |
Move sf_* variables from global variable.cc to loadsave.cc
Diffstat (limited to 'src')
-rw-r--r-- | src/loadsave.cc | 14 | ||||
-rw-r--r-- | src/variable.cc | 14 | ||||
-rw-r--r-- | src/variable.hpp | 6 |
3 files changed, 14 insertions, 20 deletions
diff --git a/src/loadsave.cc b/src/loadsave.cc index 8982d1cc..1c1bb161 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -45,6 +45,20 @@ static u32b vernum; /* Version flag */ static FILE *fff; /* Local savefile ptr */ +/* + * Savefile version + */ +static byte sf_major; +static byte sf_minor; +static byte sf_patch; + +/* + * Savefile information + */ +static u32b sf_when; /* Time when savefile created */ +static u16b sf_lives; /* Number of past "lives" with this file */ +static u16b sf_saves; /* Number of "saves" during this life */ + /** * Load/save flag */ diff --git a/src/variable.cc b/src/variable.cc index 25e01c12..a0e075b3 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -25,20 +25,6 @@ char *macro_trigger_name[MAX_MACRO_TRIG]; char *macro_trigger_keycode[2][MAX_MACRO_TRIG]; /* - * Savefile version - */ -byte sf_major; /* Savefile's "version_major" */ -byte sf_minor; /* Savefile's "version_minor" */ -byte sf_patch; /* Savefile's "version_patch" */ - -/* - * Savefile information - */ -u32b sf_when; /* Time when savefile created */ -u16b sf_lives; /* Number of past "lives" with this file */ -u16b sf_saves; /* Number of "saves" during this life */ - -/* * Run-time aruments */ bool_ arg_wizard; /* Command arg -- Request wizard mode */ diff --git a/src/variable.hpp b/src/variable.hpp index 7bdfb99e..6b1b53ef 100644 --- a/src/variable.hpp +++ b/src/variable.hpp @@ -54,12 +54,6 @@ extern char *macro_modifier_chr; extern char *macro_modifier_name[MAX_MACRO_MOD]; extern char *macro_trigger_name[MAX_MACRO_TRIG]; extern char *macro_trigger_keycode[2][MAX_MACRO_TRIG]; -extern byte sf_major; -extern byte sf_minor; -extern byte sf_patch; -extern u32b sf_when; -extern u16b sf_lives; -extern u16b sf_saves; extern bool_ character_dungeon; extern bool_ character_loaded; extern bool_ character_xtra; |