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

Comparing deliantra/server/ext/map-world.ext (file contents):
Revision 1.1 by root, Sat Jan 20 23:30:15 2007 UTC vs.
Revision 1.6 by root, Wed Jan 24 03:13:21 2007 UTC

… …
36 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 36 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0;
37 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999; 37 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
38 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999; 38 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
39 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0; 39 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
40 40
41 $self->outdoor (1);
42
43 $self->name ("'The World' at +$x+$y");
41 $self->msg ("worldmap dynamically created by map-world extension"); 44 $self->msg ("worldmap dynamically created by map-world extension");
42 45
43 #TODO: region 46 #TODO: region
44 47
45 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y 48 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
… …
54 my ($self) = @_; 57 my ($self) = @_;
55 58
56 if ($self->{load_path}) { 59 if ($self->{load_path}) {
57 $self->SUPER::load; 60 $self->SUPER::load;
58 } else { 61 } else {
62 $self->alloc;
63
59 for my $X (0 .. $WORLD->{tilew} - 1) { 64 for my $X (0 .. $WORLD->{tilew} - 1) {
60 Coro::cede; 65 Coro::cede;
61 for my $Y (0 .. $WORLD->{tileh} - 1) { 66 for my $Y (0 .. $WORLD->{tileh} - 1) {
62 my $ob = cf::object::new "deep_sea"; 67 my $ob = cf::object::new "deep_sea";
63 $self->insert ($ob, $X, $Y); 68 $self->insert ($ob, $X, $Y);
64 } 69 }
65 } 70 }
66 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1); 71 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
72
73 $self->in_memory (cf::MAP_IN_MEMORY);
67 } 74 }
68} 75}
69 76
70sub pre_load { 77sub post_load {
71 my ($self) = @_; 78 my ($self) = @_;
72 79
73 my ($x, $y) = $self->wxwy; 80 my ($x, $y) = $self->wxwy;
81
82 return
83 unless $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
84 && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
74 85
75 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew}; 86 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew};
76 my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride 87 my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride
77 + ($x - $WORLD->{minx}) * $WORLD->{tilew}; 88 + ($x - $WORLD->{minx}) * $WORLD->{tilew};
78 89
79 for my $Y (0 .. $WORLD->{tileh} - 1) { 90 for my $Y (0 .. $WORLD->{tileh} - 1) {
80 Coro::cede; 91 Coro::cede;
81 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew}; 92 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew};
82 for my $X (0 .. $WORLD->{tilew} - 1) { 93 for my $X (0 .. $WORLD->{tilew} - 1) {
94 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
83 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X]; 95 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X];
84 $self->insert ($ob, $X, $Y); 96 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
97 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
85 } 98 }
86 } 99 }
87
88 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
89} 100}
90 101
911 1021
92 103

Diff Legend

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