ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.95 by root, Mon Mar 5 01:10:30 2007 UTC vs.
Revision 1.97 by root, Sun Mar 11 00:18:45 2007 UTC

352 } else { 352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 354 }
355 } 355 }
356 356
357 # color_fg is used as default for magicmap if magicmap does not exist
358 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
359
357 # nuke outdated or never supported fields 360 # nuke outdated or never supported fields
358 delete @$ob{qw( 361 delete @$ob{qw(
359 can_knockback can_parry can_impale can_cut can_dam_armour 362 can_knockback can_parry can_impale can_cut can_dam_armour
360 can_apply pass_thru can_pass_thru 363 can_apply pass_thru can_pass_thru color_bg
361 )}; 364 )};
362 365
363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 366 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 367 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 368 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines