modified swf2lwf.rb to allow '-' for FSCommand:event and _PROG_.

gree · Nov 15, 2017 · 1d5d622 · 1d5d622
1 parent 18f2840
commit 1d5d622
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tools/swf2lwf/swf2lwf.rb b/tools/swf2lwf/swf2lwf.rb
@@ -1971,7 +1971,7 @@ def parse_action
       target = get_string
       if url =~ /^FSCommand:event$/i
         info "    EVENT " + target
-        error "Invalid event name: #{target}" unless target =~ /^[a-zA-Z0-9_]+$/
+        error "Invalid event name: #{target}" unless target =~ /^[a-zA-Z0-9_][a-zA-Z0-9_-]*$/
         actions.push [:EVENT, target]
         @event_map[target] = true
       elsif url =~ /^FSCommand:skip$/i
@@ -2602,7 +2602,7 @@ def parse_export
         @particle_name_map[name] = true
         @objects[obj_id].name = name
         @objects[obj_id].type = :PARTICLE
-      when /_PROG_([a-zA-Z0-9_]+)/
+      when /_PROG_([a-zA-Z0-9_][a-zA-Z0-9_-]*)/
         name = $1
         @program_object_name_map[name] = true
         @objects[obj_id].name = name