diff options
| author | Jesse Luehrs <doy@tozt.net> | 2014-08-15 00:22:36 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2014-08-15 00:30:19 -0400 |
| commit | 2af2ae1ba4bc79dc3476399d496a8e0089204aad (patch) | |
| tree | de0e911f4740b59e09845ce11887c03ab39cdc00 | |
| parent | eb103fec101bac54e16df0c72fb2a85ee45e5723 (diff) | |
| download | crawl-ref-2af2ae1ba4bc79dc3476399d496a8e0089204aad.tar.gz crawl-ref-2af2ae1ba4bc79dc3476399d496a8e0089204aad.zip | |
stop using a static here
| -rw-r--r-- | crawl-ref/source/wiz-dump.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/wiz-dump.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/wiz-dump.cc b/crawl-ref/source/wiz-dump.cc index 00131575db..78be75d59d 100644 --- a/crawl-ref/source/wiz-dump.cc +++ b/crawl-ref/source/wiz-dump.cc @@ -254,8 +254,7 @@ bool chardump_parser::_check_char(const vector<string> &tokens) return false; } -bool chardump_parser::_check_equipment(const vector<string> &tokens, - bool in_equipment) +bool chardump_parser::_check_equipment(const vector<string> &tokens) { size_t size = tokens.size(); @@ -317,7 +316,6 @@ bool chardump_parser::_check_equipment(const vector<string> &tokens, void chardump_parser::_modify_character(const string &inputdata) { vector<string> tokens = split_string(" ", inputdata); - static bool in_equipment = false; if (_check_skill(tokens)) return; @@ -330,7 +328,7 @@ void chardump_parser::_modify_character(const string &inputdata) if (_check_char(tokens)) return; - if (_check_equipment(tokens, in_equipment)) + if (_check_equipment(tokens)) { in_equipment = true; return; diff --git a/crawl-ref/source/wiz-dump.h b/crawl-ref/source/wiz-dump.h index 3ab44a6e9b..3016b47fed 100644 --- a/crawl-ref/source/wiz-dump.h +++ b/crawl-ref/source/wiz-dump.h @@ -8,7 +8,7 @@ class chardump_parser { public: - chardump_parser(const string &f) : filename(f) { } + chardump_parser(const string &f) : filename(f), in_equipment(false) { } bool parse(); @@ -22,9 +22,10 @@ private: bool _check_stats2(const vector<string> &tokens); bool _check_stats3(const vector<string> &tokens); bool _check_char(const vector<string> &tokens); - bool _check_equipment(const vector<string> &tokens, bool in_equipment); + bool _check_equipment(const vector<string> &tokens); string filename; + bool in_equipment; }; void wizard_load_dump_file(); |