diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-11-02 18:40:01 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-02 18:40:01 +0100 |
| commit | 6f7014e57dbcda818a39147b11138a6af05c1810 (patch) | |
| tree | a1004dc8f476634ed5b83f6a49cdedf78beb69ee /crawl-ref/source/util/art-data.pl | |
| parent | 1b5a2c568c8f8e45ab1c8e1e8df5b3ad6afe0ed7 (diff) | |
| download | crawl-ref-6f7014e57dbcda818a39147b11138a6af05c1810.tar.gz crawl-ref-6f7014e57dbcda818a39147b11138a6af05c1810.zip | |
Make clang sated and old gcc intact.
Diffstat (limited to 'crawl-ref/source/util/art-data.pl')
| -rwxr-xr-x | crawl-ref/source/util/art-data.pl | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl index d4267a2fca..15b7163686 100755 --- a/crawl-ref/source/util/art-data.pl +++ b/crawl-ref/source/util/art-data.pl @@ -77,7 +77,6 @@ my %field_type = ( equip_func => "func", unequip_func => "func", world_reacts_func => "func", - fight_func_func => "func", melee_effects_func => "func", launch_func => "func", evoke_func => "func", @@ -179,7 +178,7 @@ sub finish_art $funcs = {}; } - foreach my $func_name ("equip", "unequip", "world_reacts", "evoke") + foreach my $func_name (qw(equip unequip world_reacts evoke melee_effects launch)) { my $val; if ($funcs->{$func_name}) @@ -193,16 +192,6 @@ sub finish_art $artefact->{"${func_name}_func"} = $val; } - $artefact->{"fight_func_func"} = "NULL"; - foreach my $func_name ("melee_effects", "launch") - { - if ($funcs->{$func_name}) - { - $artefact->{"fight_func_func"} = - ".$func_name = _${enum}_$funcs->{$func_name}"; - } - } - # Default values. my $field; foreach $field (@field_list) @@ -499,8 +488,8 @@ my @art_order = ( "RMSL", "FOG", "REGEN", "NO_UPGRADE", "\n", "}", - "equip_func", "unequip_func", "world_reacts_func", "{fight_func_func", - "evoke_func" + "equip_func", "unequip_func", "world_reacts_func", "melee_effects_func", + "launch_func", "evoke_func", ); sub art_to_str |