X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=build-scripts%2Fcreate_element_defs.pl;h=90749c425a4adecf8f3cf0b0b1d0ecf3e10e89e5;hp=896d672f4a859924f2f1c74dac8558e6d0457060;hb=2aaf015a5b6264a47dd1da84ee2de1164752e9c2;hpb=3ad2ec65771088b359a4fb2808f75df1c56455ce diff --git a/build-scripts/create_element_defs.pl b/build-scripts/create_element_defs.pl index 896d672f..90749c42 100755 --- a/build-scripts/create_element_defs.pl +++ b/build-scripts/create_element_defs.pl @@ -1074,7 +1074,7 @@ sub get_known_action_definitions chomp; # cut trailing newline # process line with action definition - if (/^\#define ACTION_([A-Z0-9_]+)\s/) + if (/^ ACTION_([A-Z0-9_]+)[, ]/) { $known_action{$1} = 1; @@ -1101,7 +1101,7 @@ sub get_known_special_arg_definitions chomp; # cut trailing newline # process line with special arg definition - if (/^\#define GFX_SPECIAL_ARG_([A-Z0-9_]+)\s/) + if (/^ GFX_SPECIAL_ARG_([A-Z0-9_]+)[, ]/) { if ($1 eq 'CRUMBLED') { @@ -1160,7 +1160,7 @@ sub get_known_font_definitions chomp; # cut trailing newline # process line with font definition - if (/^\#define (FONT_[A-Z0-9_]+)\s/) + if (/^ (FONT_[A-Z0-9_]+)[, ]/) { $known_font{$1} = 1; @@ -1683,7 +1683,8 @@ sub print_element_to_special_graphic_list my @elements_with_editor_graphic = ( - 'char_space' + 'char_space', + 'steel_char_space' ); my @unknown_graphics = (); @@ -2406,8 +2407,8 @@ sub print_image_config_vars $var =~ s/\.draw_order$/.sort_priority/; $var =~ s/\.font_[a-z]+$/.font_alt/; - $var =~ s/\.INFO\[([A-Z]+)\]$/_info\[GFX_SPECIAL_ARG_INFO_$1\]/; - $var =~ s/\.SETUP\[([A-Z0-9_]+)\]$/_setup\[GFX_SPECIAL_ARG_SETUP_$1\]/; + $var =~ s/\.INFO\[([A-Z]+)\](.*)$/_info\[GFX_SPECIAL_ARG_INFO_$1\]$2/; + $var =~ s/\.SETUP\[([A-Z0-9_]+)\](.*)$/_setup\[GFX_SPECIAL_ARG_SETUP_$1\]$2/; $var =~ s/\.([A-Z]+)$/\[GFX_SPECIAL_ARG_$1\]/; $var =~ s/\.([A-Z]+)\./\[GFX_SPECIAL_ARG_$1\]./;