parse-wormedit: warn about missing level data for render

Catch resulting errors after empty input such as with wormy003.lvl
missing singleplayer levels.

diff --git a/lib/Games/Wormy/Render.pm b/lib/Games/Wormy/Render.pm
index 5a8645280e22e06a22e853a46c202c1a22cd13e2..2c83536965181a8e482dd3698e8725e4ad48961e 100644 (file)
--- a/lib/Games/Wormy/Render.pm
+++ b/lib/Games/Wormy/Render.pm
@@ -8,7 +8,7 @@ use experimental 'switch';
 use Imager;
 use List::Util qw(sum max);
 
 use Imager;
 use List::Util qw(sum max);
 

-our $VERSION = '1.00';
+our $VERSION = '1.01';

 
 our %COL = (
        bg     => Imager::Color->new(255, 255, 255),
 
 our %COL = (
        bg     => Imager::Color->new(255, 255, 255),


@@ -24,6 +24,7 @@ our %COL = (
 
 sub level {
        my ($self, $level) = @_;
 
 sub level {
        my ($self, $level) = @_;

+       $level or return;

 
        my $field = Imager->new(xsize => $level->{width}, ysize => $level->{height});
        $field->box(filled => 1, color => $COL{bg});
 
        my $field = Imager->new(xsize => $level->{width}, ysize => $level->{height});
        $field->box(filled => 1, color => $COL{bg});

diff --git a/parse-wormedit b/parse-wormedit
index 0c94994a5ae79a122d603d924af658354a898a56..ffd68efa997a1dce6b2c234ab8242ced6a23944b 100755 (executable)
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -77,10 +77,11 @@ if (defined $opt{render}) {
                # default to all singleplayer levels
                @request = 0 .. $data->{levelcount}->{single} - 1;
        }
                # default to all singleplayer levels
                @request = 0 .. $data->{levelcount}->{single} - 1;
        }

+       @request or die "no levels found or specified\n";

 
        my $img = Games::Wormy::Render->composite(
                map { $data->{levels}->[$_] } @request
 
        my $img = Games::Wormy::Render->composite(
                map { $data->{levels}->[$_] } @request

-       );
+       ) or die "empty result for levels\n";

        $img->write(
                $opt{output} ? (file => $opt{output}) : (fh => \*STDOUT, type => 'pnm')
        ) or die $img->errstr;
        $img->write(
                $opt{output} ? (file => $opt{output}) : (fh => \*STDOUT, type => 'pnm')
        ) or die $img->errstr;