ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-random.ext
(Generate patch)

Comparing deliantra/server/ext/map-random.ext (file contents):
Revision 1.5 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.8 by root, Sat Jan 20 23:30:15 2007 UTC

8 $self->{random_id} = $1; 8 $self->{random_id} = $1;
9 9
10 if (0 < Coro::AIO::aio_load "$cf::RANDOM_MAPS/$self->{random_id}.meta", my $data) { 10 if (0 < Coro::AIO::aio_load "$cf::RANDOM_MAPS/$self->{random_id}.meta", my $data) {
11 $self->{random} = cf::from_json $data; 11 $self->{random} = cf::from_json $data;
12 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; 12 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
13 } else {
14 warn "unable to read meta file for $self->{random_id}\n";
15 return 0;
13 } 16 }
14 17
15 1 18 1
19}
20
21sub thawer_merge {
22 # we have to keep some variables in memory intact
23 local $_[0]{random_id};
24 local $_[0]{random};
25
26 $_[0]->SUPER::thawer_merge ($_[1]);
16} 27}
17 28
18sub visible_name { 29sub visible_name {
19 my ($self) = @_; 30 my ($self) = @_;
20 31
30 41
31sub uniq_path { 42sub uniq_path {
32 undef 43 undef
33} 44}
34 45
35sub load_orig { 46sub load_header_orig {
36 my ($self) = @_; 47 my ($self) = @_;
37 48
38 return unless $self->{random}; 49 return unless $self->{random};
39 50
40 $self->generate_random_map ($self->{random}); 51 $self->generate_random_map ($self->{random});

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines