From: Mischa Poslawsky <wormy@shiar.org>
Date: Sun, 1 Mar 2009 15:37:08 +0000 (+0100)
Subject: parse-wormedit: better support for missing multiplayer levels
X-Git-Url: http://git.shiar.nl/wormy.git/commitdiff_plain/e448cc15fa7f3168db2ff13ee61d64fdea20830f?hp=6c599c66b38654aef23387cc2d4800dc10ea74f5

parse-wormedit: better support for missing multiplayer levels

- Do not try to read levels if none are declared (common for
  singleplayer-only episodes).
- Read episode finish code after parsing singleplayer levels,
  so that the starting offset is correct.
---

diff --git a/parse-wormedit b/parse-wormedit
index 6eb7915..8136c58 100755
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -263,6 +263,14 @@ sub read {
 	$data->{moderef}->{offset}->{single} == $offsetbase
 		or warn "First singleplayer level is not in front\n";
 
+	my $slots = sum(
+		$data->{moderef}->{end}->{single} > 0,  # singleplayer slot if any levels
+		$data->{moderef}->{end}->{peaworm},     # one for each peaworm arena
+		$data->{moderef}->{end}->{tron},        # idem for tron
+	);
+	$data->{hinames} = [ unpack '(x2a3)*', substr($data->{leveldata}, -5 * $slots) ];
+	$data->{format} = '86s';
+
 	my @VARMODES = (
 		[qw'single  single'],
 		[qw'multi   peaworm tron deathmatch foodmatch multifood timematch'],
@@ -273,7 +281,9 @@ sub read {
 	$data->{levels} = [];
 	for my $modes (@VARMODES) {
 		my $variant = shift @$modes;
-		$offset = min(map { $data->{moderef}->{offset}->{$_} } @$modes) - $offsetbase;
+		$offset = min(grep {$_} map { $data->{moderef}->{offset}->{$_} } @$modes)
+			or next;
+		$offset -= $offsetbase;
 		my $amount = $variant eq 'single' ? 100 : max(map { $data->{moderef}->{end}->{$_} } @$modes);
 
 		my @varform = @LEVELFORM;
@@ -317,16 +327,14 @@ sub read {
 			$offset += ++$size;
 			last if ++$data->{levelcount}->{$variant} >= $amount;
 		}
+
+		if ($variant eq 'single') {
+			$data->{finish}->{code} = substr(
+				delete($data->{leveldata}), $offset, -5 * $slots
+			);
+		}
 	}
 
-	my $slots = sum(
-		$data->{moderef}->{end}->{single} > 0,  # singleplayer slot if any levels
-		$data->{moderef}->{end}->{peaworm},     # one for each peaworm arena
-		$data->{moderef}->{end}->{tron},        # idem for tron
-	);
-	$data->{hinames} = [ unpack '(x2a3)*', substr($data->{leveldata}, -5 * $slots) ];
-	$data->{finish}->{code} = substr delete($data->{leveldata}), $offset, -5 * $slots; #XXX
-	$data->{format} = '86s';
 	return $data;
 }