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

Comparing deliantra/gde/GCE/Util.pm (file contents):
Revision 1.7 by elmex, Fri Mar 17 01:18:01 2006 UTC vs.
Revision 1.13 by elmex, Sat Apr 1 18:45:05 2006 UTC

15use Storable; 15use Storable;
16use List::Util qw(min max); 16use List::Util qw(min max);
17 17
18use Crossfire; 18use Crossfire;
19use Crossfire::MapWidget; 19use Crossfire::MapWidget;
20use File::Spec::Functions;
21use Cwd 'abs_path';
20 22
21our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall stack_find arch_is_wall arch_is_monster add_table_widget quick_msg def arch_is_exit); 23our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall stack_find arch_is_wall arch_is_monster add_table_widget quick_msg def arch_is_exit map2abs exit_paths);
24
25sub exit_paths {
26 my ($mappath, $map1path, $map2path) = @_;
27 $mappath = abs_path $mappath;
28 $map1path = abs_path $map1path;
29 $map2path = abs_path $map2path;
30
31 if ( (substr $map1path, 0, length $mappath) eq $mappath
32 and (substr $map2path, 0, length $mappath) eq $mappath) {
33 substr $map1path, 0, length $mappath, '';
34 substr $map2path, 0, length $mappath, '';
35
36 my ($v1, $d1, $f1) = File::Spec->splitpath ($map1path);
37 my ($v2, $d2, $f2) = File::Spec->splitpath ($map2path);
38
39 my @di1 = File::Spec->splitdir ($d1);
40 my @di2 = File::Spec->splitdir ($d2);
41
42 if ((defined $di1[1]) and (defined $di2[1]) and $di1[1] eq $di2[1]) {
43 my $m1 = File::Spec->abs2rel ($map1path, File::Spec->catdir (@di2));
44 my $m2 = File::Spec->abs2rel ($map2path, File::Spec->catdir (@di1));
45 return ($m1, $m2);
46 } else {
47 return ($map1path, $map2path);
48 }
49 } else {
50 return ('', '');
51 }
52}
53
54sub map2abs {
55 my ($dest, $mape) = @_;
56
57 my $dir;
58 if (File::Spec->file_name_is_absolute($dest)) {
59 $dir = catdir ($::CFG->{MAPDIR}, $dest);
60 } else {
61 my ($v, $p, $f) = File::Spec->splitpath ($mape->{path});
62 $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p));
63 }
64 return $dir;
65}
22 66
23sub def($$) { 67sub def($$) {
24 return defined ($_[0]) ? $_[0] : $_[1]; 68 return defined ($_[0]) ? $_[0] : $_[1];
25} 69}
26 70
94 return $type eq '66' || $type eq '41'; 138 return $type eq '66' || $type eq '41';
95} 139}
96 140
97sub arch_is_floor { 141sub arch_is_floor {
98 my ($a) = @_; 142 my ($a) = @_;
143 my $ar = Crossfire::arch_attr $a;
144 return (substr $ar->{name}, 0, 5) eq 'Floor';
99 return $Crossfire::ARCH{$a->{_name}}->{is_floor}; 145#return $Crossfire::ARCH{$a->{_name}}->{is_floor};
100} 146}
101 147
102sub arch_is_wall { 148sub arch_is_wall {
103 my ($a) = @_; 149 my ($a) = @_;
150 my $ar = Crossfire::arch_attr $a;
151 return $ar->{name} eq 'Wall';
104 return $Crossfire::ARCH{$a->{_name}}->{no_pass}; 152#return $Crossfire::ARCH{$a->{_name}}->{no_pass};
105} 153}
106 154
107sub arch_is_monster { 155sub arch_is_monster {
108 my ($a) = @_; 156 my ($a) = @_;
109 my $arch = $Crossfire::ARCH{$a->{_name}}; 157 my $arch = $Crossfire::ARCH{$a->{_name}};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines