Merge remote-tracking branch 'origin/cbrutail/leavefix220911'

[xonotic/xonotic-maps.pk3dir.git] / scripts / entities.def2ent

diff --git a/scripts/entities.def2ent b/scripts/entities.def2ent
old mode 100644 (file)
new mode 100755 (executable)
index d7e11f2..2ade993
--- a/scripts/entities.def2ent
+++ b/scripts/entities.def2ent
@@ -11,7 +11,7 @@ open my $fh, '<', '../../xonotic-data.pk3dir/qcsrc/server/qc.asm'
 while(<$fh>)
 {
        chomp;
-       if(/^\.(\w+) (\w+);$/)
+       if(/^\.(\w+) (\w+);(?: \/\* at .* \*\/)$/)
        {
                if($1 eq "float")
                {
@@ -29,7 +29,7 @@ while(<$fh>)
 }
 
 # specialization
-$types{angle} = "angle";
+$types{angle} = "direction";
 $types{angles} = "angles";
 $types{_color} = "color";
 $types{colormod} = "color";
@@ -45,6 +45,8 @@ $types{target3} = "target";
 $types{target4} = "target";
 $types{targetname} = "targetname";
 $types{target} = "target";
+$types{team} = "integer";
+$types{target_random} = "boolean";
 
 # missing definition in QC, q3map2 only
 $types{_ambient} = "real";
@@ -61,7 +63,8 @@ $types{fade} = "real";
 $types{_farplanedist} = "real";
 $types{_filterradius} = "real";
 $types{_floodlight} = "string";
-$types{_frame} = "real";
+$types{_frame} = "integer";
+$types{_skin} = "integer";
 $types{gridsize} = "integer3";
 $types{_ignoreleaks} = "boolean";
 $types{_indexmap} = "texture";