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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.92 by root, Sat Mar 3 19:32:00 2007 UTC vs.
Revision 1.96 by root, Sun Mar 11 00:14:44 2007 UTC

 =cut
 package Crossfire;
-our $VERSION = '0.96';
+our $VERSION = '0.97';
 use strict;
 use base 'Exporter';
 {
    package Crossfire::MoveType;
    use overload
+      '='  => sub { bless [@{$_[0]}], ref $_[0] },
       '""' => \&as_string,
       '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
       '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |=  $MOVE_TYPE{$_[1]}; &normalise },
       '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
       '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
       'x=' => sub {
          my $cur = $_[0] >= $_[1];
          if (!defined $cur) {
+            if ($_[0] >= "all") {
+               $_[0] -= $_[1];
+            } else {
-            $_[0] += $_[1];
+               $_[0] += $_[1];
+            }
          } elsif ($cur) {
             $_[0] -= $_[1];
          } else {
             $_[0] /= $_[1];
          }
       } else {
          warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
       }
    }
+   # color_fg is used as default for magicmap if magicmap does not exist
+   $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
    )};

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