… | |
… | |
170 | my $append; $append = sub { |
170 | my $append; $append = sub { |
171 | my %a = %{$_[0]}; |
171 | my %a = %{$_[0]}; |
172 | |
172 | |
173 | Crossfire::normalize_arch \%a; |
173 | Crossfire::normalize_arch \%a; |
174 | |
174 | |
175 | $str .= "arch " . (delete $a{_name}) . "\n"; |
175 | $str .= "arch $a{_name}\n"; |
176 | |
176 | |
177 | my $inv = delete $a{inventory}; |
177 | my $inv = delete $a{inventory}; |
178 | delete $a{more}; # arch do not support 'more', but old maps can contain some |
178 | delete $a{more}; # arches do not support 'more', but old maps can contain some |
179 | |
179 | |
180 | my @kv; |
180 | my @kv; |
181 | |
181 | |
|
|
182 | for ($a{_name} eq "map" |
|
|
183 | ? @Crossfire::FIELD_ORDER_MAP |
182 | for (@Crossfire::FIELD_ORDER) { |
184 | : @Crossfire::FIELD_ORDER) { |
183 | push @kv, [$_, delete $a{$_}] |
185 | push @kv, [$_, delete $a{$_}] |
184 | if exists $a{$_}; |
186 | if exists $a{$_}; |
185 | } |
187 | } |
186 | |
188 | |
187 | for (sort keys %a) { |
189 | for (sort keys %a) { |