X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=build-scripts%2Fcreate_element_defs.pl;h=bd8cd46d2188af5d826b0b160a381f6007ee3bce;hp=2022b746eae8cb55929fbe4c5dab238030be18ec;hb=b6d00a8a639220e3589641e843c8594024ce3076;hpb=c2cd20713c13fe24152297e1ac5d049305125f5c

diff --git a/build-scripts/create_element_defs.pl b/build-scripts/create_element_defs.pl
index 2022b746..bd8cd46d 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
@@ -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;
 
@@ -2406,8 +2406,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\]./;