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.4 by root, Sun Jan 21 13:40:42 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
41 $self->msg ("worldmap dynamically created by map-world extension"); 43 $self->msg ("worldmap dynamically created by map-world extension");
42 44
43 #TODO: region 45 #TODO: region
44 46
45 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y 47 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
… …
54 my ($self) = @_; 56 my ($self) = @_;
55 57
56 if ($self->{load_path}) { 58 if ($self->{load_path}) {
57 $self->SUPER::load; 59 $self->SUPER::load;
58 } else { 60 } else {
61 $self->alloc;
62
59 for my $X (0 .. $WORLD->{tilew} - 1) { 63 for my $X (0 .. $WORLD->{tilew} - 1) {
60 Coro::cede; 64 Coro::cede;
61 for my $Y (0 .. $WORLD->{tileh} - 1) { 65 for my $Y (0 .. $WORLD->{tileh} - 1) {
62 my $ob = cf::object::new "deep_sea"; 66 my $ob = cf::object::new "deep_sea";
63 $self->insert ($ob, $X, $Y); 67 $self->insert ($ob, $X, $Y);
64 } 68 }
65 } 69 }
66 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1); 70 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
71
72 $self->in_memory (cf::MAP_IN_MEMORY);
67 } 73 }
68} 74}
69 75
70sub pre_load { 76sub post_load {
71 my ($self) = @_; 77 my ($self) = @_;
72 78
73 my ($x, $y) = $self->wxwy; 79 my ($x, $y) = $self->wxwy;
74 80
75 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew}; 81 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew};
… …
78 84
79 for my $Y (0 .. $WORLD->{tileh} - 1) { 85 for my $Y (0 .. $WORLD->{tileh} - 1) {
80 Coro::cede; 86 Coro::cede;
81 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew}; 87 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew};
82 for my $X (0 .. $WORLD->{tilew} - 1) { 88 for my $X (0 .. $WORLD->{tilew} - 1) {
89 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
83 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X]; 90 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X];
84 $self->insert ($ob, $X, $Y); 91 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
92 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
85 } 93 }
86 } 94 }
87
88 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
89} 95}
90 96
911 971
92 98

Diff Legend

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