X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=build-scripts%2Fcreate_element_defs.pl;h=896d672f4a859924f2f1c74dac8558e6d0457060;hp=af4b2bdffd8977fdedf25415eb2b7fbc61bf6110;hb=3ad2ec65771088b359a4fb2808f75df1c56455ce;hpb=72bb1f5d2849131d094f38b9a0ce2d17ecacefe1 diff --git a/build-scripts/create_element_defs.pl b/build-scripts/create_element_defs.pl index af4b2bdf..896d672f 100755 --- a/build-scripts/create_element_defs.pl +++ b/build-scripts/create_element_defs.pl @@ -243,12 +243,12 @@ sub print_file_header close FILE; print "\n"; - print "/* ----- $text_auto ----- */\n"; + print "// ------- $text_auto -------\n"; print "\n"; print "#ifndef $filename_def\n"; print "#define $filename_def\n"; print "\n"; - print "/* $comment */\n"; + print "// $comment\n"; print "\n"; } @@ -259,7 +259,7 @@ sub print_file_footer $filename_def =~ s/\./_/; print "\n"; - print "#endif /* $filename_def */\n"; + print "#endif // $filename_def\n"; } sub get_tabs @@ -1573,7 +1573,7 @@ sub print_element_to_graphic_list { print_element_to_graphic_entry($element_without_action, $gfx_action, - '-1', + $gfx_direction, $gfx_crumbled, $graphic); } @@ -2362,10 +2362,13 @@ sub print_image_config_vars $var =~ s/^\[player\]\./game.player_/; $var =~ s/^\[title_initial\]/title_initial_default/; $var =~ s/^\[title\]/title_default/; + $var =~ s/^\[titlescreen_initial\]/titlescreen_initial_default/; + $var =~ s/^\[titlescreen\]/titlescreen_default/; $var =~ s/^\[titlemessage_initial\]/titlemessage_initial_default/; $var =~ s/^\[titlemessage\]/titlemessage_default/; - if ($var =~ /^titlemessage.*(\d)/ || + if ($var =~ /^titlescreen.*(\d)/ || + $var =~ /^titlemessage.*(\d)/ || $var =~ /^game.panel.key_(\d)/ || $var =~ /^game.panel.inventory_first_(\d)/ || $var =~ /^game.panel.inventory_last_(\d)/ || @@ -2391,10 +2394,14 @@ sub print_image_config_vars # --- some suffix replacements --- $var =~ s/^(menu\.main\..*)\.chars$/$1.size/; + $var =~ s/^(tape\.text\..*)\.chars$/$1.size/; $var =~ s/^(game\.panel\..*)\.chars$/$1.size/; $var =~ s/^(game\.panel\..*)\.tile_size$/$1.size/; $var =~ s/^(request\.button\..*)\.tile_size$/$1.size/; $var =~ s/\.digits$/.size/; + $var =~ s/\.2nd_offset$/.offset2/; + $var =~ s/\.2nd_xoffset$/.xoffset2/; + $var =~ s/\.2nd_yoffset$/.yoffset2/; $var =~ s/\.element$/.id/; $var =~ s/\.draw_order$/.sort_priority/; @@ -2404,7 +2411,7 @@ sub print_image_config_vars $var =~ s/\.([A-Z]+)$/\[GFX_SPECIAL_ARG_$1\]/; $var =~ s/\.([A-Z]+)\./\[GFX_SPECIAL_ARG_$1\]./; - if ($var =~ /^(menu.(enter|leave)_screen)(.[a-z_]+)$/) + if ($var =~ /^(menu.(enter|leave|next)_screen)(.[a-z_]+)$/) { $var = $1 . "[GFX_SPECIAL_ARG_DEFAULT]" . $3; } @@ -2414,12 +2421,23 @@ sub print_image_config_vars $var .= "[GFX_SPECIAL_ARG_DEFAULT]"; } - if ($var =~ /^(viewport.(playfield|door_[12]))(.[a-z_]+)$/) + if ($var =~ /^(viewport.(window|playfield|door_[12]))(.[a-z_]+)$/) { $var = $1 . "[GFX_SPECIAL_ARG_DEFAULT]" . $3; } print_image_config_var_entry("\"$token\"", "&$var"); + + if ($var =~ /^(title)_default/ || + $var =~ /^(title_initial)_default/ || + $var =~ /^(titlescreen.*)\[\d\]/ || + $var =~ /^(titlemessage.*)\[\d\]/) + { + my $prefix = $1; + $var =~ s/^$prefix/${prefix}_first/; + + print_image_config_var_entry("\"$token\"", "&$var"); + } } }