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

Comparing deliantra/server/ext/item-worldmap.ext (file contents):
Revision 1.19 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.20 by root, Tue Sep 23 04:29:11 2008 UTC

104 104
105 cf::override 1; 105 cf::override 1;
106 }, 106 },
107; 107;
108 108
109cf::post_init {
109cf::async_ext { 110 cf::async_ext {
110 $Coro::current->{desc} = "worldmap updater"; 111 $Coro::current->{desc} = "worldmap updater";
111 112
112 while () { 113 while () {
113 Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL; 114 Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL;
114 115
115 cf::get_slot 0.01, -50, "worldmap update"; 116 cf::get_slot 0.01, -50, "worldmap update";
116 117
117 ++$GENCOUNT; 118 ++$GENCOUNT;
118 119
119 # recalculate player info 120 # recalculate player info
120 my %new; 121 my %new;
121 for (values %cf::PLAYER) { 122 for (values %cf::PLAYER) {
122 my $map = $_->ob->map 123 my $map = $_->ob->map
123 or next; 124 or next;
124 $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/ 125 $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/
125 or next; 126 or next;
126 127
127 my $ob = $_->ob; 128 my $ob = $_->ob;
128 my $x = ($1 - 100) * 50 + $ob->x; 129 my $x = ($1 - 100) * 50 + $ob->x;
129 my $y = ($2 - 100) * 50 + $ob->y; 130 my $y = ($2 - 100) * 50 + $ob->y;
130 131
131 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500 132 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500
132 or next; 133 or next;
133 134
134 $x = int $x * $MAPW / 1500; 135 $x = int $x * $MAPW / 1500;
135 $y = int $y * $MAPH / 1500; 136 $y = int $y * $MAPH / 1500;
136 137
137 my $name = $ob->name; 138 my $name = $ob->name;
138 139
139 if (my $pi = delete $PLAYERINFO{$name}) { 140 if (my $pi = delete $PLAYERINFO{$name}) {
140 if ($pi->[0] == $x && $pi->[1] == $y) { 141 if ($pi->[0] == $x && $pi->[1] == $y) {
141 $new{$name} = $pi; 142 $new{$name} = $pi;
142 next; 143 next;
144 }
143 } 145 }
146
147 $new{$name} = [$x, $y];
144 } 148 }
149
150 *PLAYERINFO = \%new;
151
152 cf::get_slot 0.03, -50, "worldmap socket update";
153 for (values %cf::PLAYER) {
154 my $ns = $_->ns
145 155 or next;
146 $new{$name} = [$x, $y]; 156
157 update_worldmap $ns->{ws_worldmap}
158 if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
159 }
147 } 160 }
148
149 *PLAYERINFO = \%new;
150
151 cf::get_slot 0.03, -50, "worldmap socket update";
152 for (values %cf::PLAYER) {
153 my $ns = $_->ns
154 or next;
155
156 update_worldmap $ns->{ws_worldmap}
157 if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
158 }
159 } 161 };
160}; 162};
161 163

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines