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 | d63789e481ea6cc451934ca868f7de1aec6abc38 (patch) | |
tree | 3d01cc44331d8a119d1f9c333a37622dee71ecc8 /src/init1.cc | |
parent | e479a53de8b12bc754b966bb486bb1cbc78f5ed0 (diff) |
Change "activation spells" to use the old style
This fits in better with the rest of the code and lets us clean up the
spell handling a bit.
Activation failure rate for the moved items may have changed slightly,
but it doesn't seem like this would be much of an issue.
Diffstat (limited to 'src/init1.cc')
-rw-r--r-- | src/init1.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/init1.cc b/src/init1.cc index 52405944..7e278d0e 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -1398,6 +1398,12 @@ static const char *activation_names[] = "XXX198", "XXX199", "MUSIC", /* 200*/ + "ETERNAL_FLAME", /* 201 */ + "MAGGOT", /* 202 */ + "LEBOHAUM", /* 203 */ + "DURANDIL", /* 204 */ + "RADAGAST", /* 205, Theme */ + "VALAROMA", /* 206, Theme */ "" }; @@ -1670,14 +1676,18 @@ static errr grab_one_player_race_flag(u32b *f1, u32b *f2, cptr what) } /* Get an activation number (good for artifacts, recipes, egos, and object kinds) */ -int get_activation(char *activation) +static int get_activation(char *activation) { int i; for ( i = 0 ; activation_names[i][0] ; i++) + { if (!strncmp(activation_names[i], activation, 19)) { return i; } + } + + msg_format("Unknown activation '%s'.", activation); return -1; } |