diff options
author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
commit | 46a9d6e37cf61e03ab9c0fd03ebf04aca6a965d2 (patch) | |
tree | bbd577809ea34890590dbc4aec334486b79f5eae /src/init1.cc | |
parent | 22fa4f72237717897af77198c88f2af00c393438 (diff) |
Remove "HARDCORE=" and "SPELL=" handling for txt files
We no longer need the distinction between HARDCORE= and SPELL= any
longer, so just get rid of the prefix.
Diffstat (limited to 'src/init1.cc')
-rw-r--r-- | src/init1.cc | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/src/init1.cc b/src/init1.cc index 7e278d0e..8696e18a 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -4382,17 +4382,10 @@ errr init_k_info_txt(FILE *fp, char *buf) /* Process 'a' for Activation */ if ( buf[0] == 'a') { - if (prefix(buf + 2, "HARDCORE=")) + k_ptr->activate = get_activation(buf + 2); + if (k_ptr->activate == -1) { - k_ptr->activate = get_activation(buf + 11); - if (k_ptr->activate == -1) - return 1; - } - else if (prefix(buf + 2, "SPELL=")) - { - k_ptr->activate = -find_spell(buf + 8); - if (k_ptr->activate == -( -1)) - return 1; + return 1; } /* Next... */ @@ -5329,17 +5322,10 @@ errr init_a_info_txt(FILE *fp, char *buf) /* Read activation type. */ if (buf[0] == 'a') { - if (prefix(buf + 2, "HARDCORE=")) + a_ptr->activate = get_activation(buf + 2); + if (a_ptr->activate == -1) { - a_ptr->activate = get_activation(buf + 11); - if (a_ptr->activate == -1) - return 1; - } - else if (prefix(buf + 2, "SPELL=")) - { - a_ptr->activate = -find_spell(buf + 8); - if (a_ptr->activate == -( -1)) - return 1; + return 1; } /* Next... */ @@ -6809,16 +6795,9 @@ errr init_e_info_txt(FILE *fp, char *buf) if (buf[0] == 'a') { - if (prefix(buf + 2, "HARDCORE=")) - { - e_ptr->activate = get_activation(buf + 11); - if (e_ptr->activate == -1) - return 1; - } - else if (prefix(buf + 2, "SPELL=")) + e_ptr->activate = get_activation(buf + 2); + if (e_ptr->activate == -1) { - e_ptr->activate = -find_spell(buf + 8); - if (e_ptr->activate == -( -1)) return 1; } |