[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.97 by root, Sun Mar 11 00:18:45 2007 UTC vs.
Revision 1.100 by root, Thu Apr 5 17:33:31 2007 UTC

 =cut
 package Crossfire;
-our $VERSION = '0.97';
+our $VERSION = '0.98';
 use strict;
 use base 'Exporter';
 our @EXPORT = qw(
    read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
 );
-use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
+use JSON::XS qw(from_json to_json);
-sub from_json($) {
-   $JSON::Syck::ImplicitUnicode = 1;
-   JSON::Syck::Load $_[0]
-}
-sub to_json($) {
-   $JSON::Syck::ImplicitUnicode = 0;
-   JSON::Syck::Dump $_[0]
-}
 our $LIB = $ENV{CROSSFIRE_LIBDIR};
 our $VARDIR = $ENV{HOME}    ? "$ENV{HOME}/.crossfire"
             : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
    $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
    # nuke outdated or never supported fields
    delete @$ob{qw(
       can_knockback can_parry can_impale can_cut can_dam_armour
-      can_apply pass_thru can_pass_thru color_bg
+      can_apply pass_thru can_pass_thru color_bg color_fg
    )};
    if (my $mask = delete $ob->{immune}    ) { _add_resist $ob, $mask,  100; }
    if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask,   30; }
    if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines