--- deliantra/Deliantra/Deliantra.pm 2006/02/09 19:59:29 1.12 +++ deliantra/Deliantra/Deliantra.pm 2006/02/09 20:54:42 1.13 @@ -12,6 +12,7 @@ use base 'Exporter'; +use Carp (); use Storable; #XXX: The map_* procedures scream for a map-object @@ -23,12 +24,25 @@ ); our $LIB = $ENV{CROSSFIRE_LIBDIR} - or die "\$CROSSFIRE_LIBDIR must be set\n"; + or Carp::croak "\$CROSSFIRE_LIBDIR must be set\n"; sub TILESIZE (){ 32 } our $ARCH; +our %FIELD_MULTILINE = ( + msg => "endmsg", +); + +# not used yet, maybe alphabetical is ok +our @FIELD_ORDER = (qw(name name_pl)); + +# not used yet, AND NOT CHECKED, should also be BY TYPE +our %FIELD_NORMALIZE = ( + "enter_x" => "hp", + "enter_y" => "sp", +); + sub read_pak($;$) { my ($path, $cache) = @_; @@ -40,7 +54,7 @@ my %pak; open my $fh, "<:raw", $path - or die "$_[0]: $!"; + or Carp::croak "$_[0]: $!"; while (<$fh>) { my ($type, $id, $len, $path) = split; $path =~ s/.*\///; @@ -66,7 +80,7 @@ my ($more, $prev); open my $fh, "<:raw", $path - or die "$path: $!"; + or Carp::croak "$path: $!"; my $parse_block; $parse_block = sub { my %arc = @_;