X-Git-Url: http://git.shiar.nl/wormy.git/blobdiff_plain/aac9f02cab2d03379669c2f278d62330151d44e0..5f543f9395f3a885ee9b751e98d069b9ed54f885:/parse-wormedit

diff --git a/parse-wormedit b/parse-wormedit
index 81c0734..5761a30 100755
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -283,9 +283,10 @@ sub read {
 				$_->[13] = $_->[15];  # ctf
 				$_->[15] = 'domination';
 			} for @{ $FORMAT[9] }; # no multifood
-			push @LEVELFORM, "object$_" => ['C',
+			push @LEVELFORM, "objects$_" => ['C',
+				type => "=$_",
 				map {$_ => 'C'} qw(x1 y1 x2 y2)
-			] for qw(lines boxes);
+			] for 2, 3;
 		}
 		default {
 			die "Unsupported level version $version\n";
@@ -354,8 +355,8 @@ sub read {
 			# add objects until terminator
 			$level->{objects} = [];
 		if ($version <= 91) {
-			push @{ $level->{objects} }, { %$_, type => 2 } for map { $level->{$_} ? @{ $level->{$_} } : () } qw(objectlines);
-			push @{ $level->{objects} }, { %$_, type => 3 } for map { $level->{$_} ? @{ $level->{$_} } : () } qw(objectboxes);
+			ref $_ eq 'ARRAY' and push @{ $level->{objects} }, @$_
+				for map { delete $level->{"objects$_"} } 2, 3;
 			$size += 1 + 4 * scalar @{ $level->{objects} };
 		}
 		else {