Parse::Binary::Nested: simple non-OO unpackf

[wormy.git] / parse-wormedit

diff --git a/parse-wormedit b/parse-wormedit
index 5761a30107a585d2af0f172d9e607c9a05b1fb26..ed64118e23ef31f7f7f8fc8cce90c9b6427c7b9a 100755 (executable)
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -19,7 +19,7 @@ package Shiar_Parse::WormEdit;
 use strict;
 use warnings;
 
-use Parse::Binary::Nested;
+use Parse::Binary::Nested qw(unpackf);
 
 our %MAGICID = (
        "WormEdit053\000LVL" => 53,
@@ -31,8 +31,8 @@ our %MAGICID = (
 my @FORMAT = (
        magic       => 'a15',
        version     => 'C',
-       name        => 'Ca32',
-       description => 'Ca64x256',
+       name        => 'C/a32',
+       description => 'C/a64x256',
        levelcount  => [1,
                single => 'C',
                multi  => 'C',
@@ -59,14 +59,14 @@ my @FORMAT = (
        ],
        finish      => [1,
                type    => 's',
-               message => 'Ca255',
-               code    => 'Ca255',
+               message => 'C/a255',
+               code    => 'C/a255',
                reserved=> 'x256',
        ],
        hiname      => 'a3',
        levels      => ['*', # levelcount->total actually
-               id         => 'Ca22',
-               name       => 'Ca22',
+               id         => 'C/a22',
+               name       => 'C/a22',
                size       => 'C',
                peas       => 'C',
                delay      => 'C',
@@ -131,7 +131,7 @@ sub read {
        $fileversion += 100 if $fileversion < 90;  # 93..95 came before 50..53
        given ($fileversion) {
                when (153) { } # current @FORMAT
-                       $FORMAT[7] = 'Ca64'; # no reserved space after description
+                       $FORMAT[7] = 'C/a64'; # no reserved space after description
                        splice @{ $FORMAT[15] }, -2; # finish reserve
                        $FORMAT[-1]->[-1]->[0] = '32C'; # less objects
                        ref $_ and pop @$_ for @{ $FORMAT[11] }; # 9 moderefs
@@ -153,7 +153,7 @@ sub read {
 
        # convert to an easily accessible hash
        push @FORMAT, -trail => 'a*';
-       my $data = Parse::Binary::Nested->new(\@FORMAT)->unpackf($input);
+       my $data = unpackf(\@FORMAT, $input);
        warn "Trailing data left unparsed\n" if length delete $data->{-trail};
        $data->{format} = 'WormEdit';
        return $data;
@@ -167,7 +167,7 @@ use warnings;
 
 use List::Util qw(sum min max);
 use Data::Dumper;
-use Parse::Binary::Nested;
+use Parse::Binary::Nested qw(unpackf);
 
 sub read {
        my ($self, $input) = @_;
@@ -293,7 +293,7 @@ sub read {
                }
        }
 
-       my $data = Parse::Binary::Nested->new(\@FORMAT)->unpackf($input);
+       my $data = unpackf(\@FORMAT, $input);
        my $offset = 0;
        $offsetbase += 1 + @{ $data->{sprite} } if $data->{sprite};
        $data->{moderef}->{offset}->{single} == $offsetbase
@@ -331,6 +331,7 @@ sub read {
                unshift @varform, name => 'Z*' unless $variant eq 'single' or $version <= 91;
                $varform[-1]->[0] = 1 if $variant eq 'race' and $version > 91;
                $varform[-1]->[0] = 2 if $variant eq 'ctf';
+               push @varform, size => '=.';
                my $parselevel = Parse::Binary::Nested->new(\@varform);
 
                while ($offset < length $data->{leveldata}) {
@@ -349,7 +350,7 @@ sub read {
                                + 2 * ($level->{flags} ? ref $level->{flags} eq 'ARRAY' ? scalar @{$level->{flags}} : 1 : 0)
                                + ($level->{sprite} ? scalar @{$level->{sprite}} : 0)
                                + ($level->{balls} ? 3 * scalar @{$level->{balls}} : 0);
-                       $level->{size} = $size;
+                       $level->{sizecalc} = $size;
                        $level->{offset} = $offset + $offsetbase;
 
                        # add objects until terminator
@@ -357,7 +358,6 @@ sub read {
                if ($version <= 91) {
                        ref $_ eq 'ARRAY' and push @{ $level->{objects} }, @$_
                                for map { delete $level->{"objects$_"} } 2, 3;
-                       $size += 1 + 4 * scalar @{ $level->{objects} };
                }
                else {
                        while (my $object = ord substr($data->{leveldata}, $offset+$size, 1)) {
@@ -370,7 +370,7 @@ sub read {
 
                        # add parsed level and advance
                        push @{ $data->{levels} }, $level;
-                       $offset += ++$size;
+                       $offset += $level->{size};
                        last if ++$data->{levelcount}->{$variant} >= $amount;
                }