… | |
… | |
19 | my $new; |
19 | my $new; |
20 | |
20 | |
21 | my $name = $ws->{ns}->pl->ob->name; |
21 | my $name = $ws->{ns}->pl->ob->name; |
22 | |
22 | |
23 | while (my ($k, $v) = each %PLAYERINFO) { |
23 | while (my ($k, $v) = each %PLAYERINFO) { |
24 | my $label = $old->{$k} || do { |
24 | my $label = (delete $old->{$k}) || do { |
25 | my $label = $ws->new (Label => |
25 | my $label = $ws->new (Label => |
26 | text => $k, |
26 | text => $k, |
27 | fontsize => 0.2, |
27 | fontsize => 0.2, |
|
|
28 | ); |
|
|
29 | |
|
|
30 | my $marker = $ws->new (Face => |
|
|
31 | face => $ws->{ns}->need_face ("res/map-arrow"), |
|
|
32 | ); |
|
|
33 | my $children = [$label, $marker]; |
|
|
34 | |
|
|
35 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
|
|
36 | children => $children, |
28 | c_halign => -.5, |
37 | c_halign => -.5, |
29 | c_valign => -1, |
38 | c_valign => -1, |
30 | ); |
39 | )); |
31 | $ws->{canvas}->add ($label); |
40 | $vbox->{children} = $children; |
|
|
41 | |
32 | $label |
42 | $vbox |
33 | }; |
43 | }; |
34 | |
44 | |
35 | $new->{$k} = $label; |
45 | $new->{$k} = $label; |
36 | |
46 | |
37 | if ($v != $label->{prevpos}) { |
47 | if ($v != $label->{prevpos}) { |
… | |
… | |
63 | $_[0]{visibility} = $_[1]; |
73 | $_[0]{visibility} = $_[1]; |
64 | update_worldmap $_[0]{ws} if $_[1]; |
74 | update_worldmap $_[0]{ws} if $_[1]; |
65 | }, |
75 | }, |
66 | ); |
76 | ); |
67 | |
77 | |
68 | my $face = cf::face::find "res/worldmap.jpg"; |
|
|
69 | $ns->send_face ($face); |
|
|
70 | $ns->flush_fx; |
|
|
71 | |
|
|
72 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
78 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
73 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
79 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
74 | |
80 | |
75 | $ws->{mapface} = $ws->new (Face => |
81 | $ws->{mapface} = $ws->new (Face => |
76 | expand => 1, |
|
|
77 | size_w => undef, |
82 | size_w => undef, |
78 | size_h => undef, |
83 | size_h => undef, |
79 | face => $face, |
84 | face => $ws->{ns}->need_face ("res/worldmap"), |
80 | ); |
85 | ); |
81 | |
86 | |
82 | $ws->{canvas}->add ($ws->{mapface}); |
87 | $ws->{canvas}->add ($ws->{mapface}); |
83 | |
88 | |
84 | $ws |
89 | $ws |
… | |
… | |
92 | |
97 | |
93 | if ($ns->{can_widget}) { |
98 | if ($ns->{can_widget}) { |
94 | my $ws = $ns->{ws_worldmap} ||= create_widgets $ns; |
99 | my $ws = $ns->{ws_worldmap} ||= create_widgets $ns; |
95 | $ws->{toplevel}->toggle_visibility; |
100 | $ws->{toplevel}->toggle_visibility; |
96 | } else { |
101 | } else { |
97 | $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try CFPlus at http://crossfire.schmorp.de/.", cf::NDI_RED); |
102 | $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try the deliantra client at http://www.deliantra.net/.", cf::NDI_RED); |
98 | } |
103 | } |
99 | |
104 | |
100 | cf::override 1; |
105 | cf::override 1; |
101 | }, |
106 | }, |
102 | ; |
107 | ; |
103 | |
108 | |
|
|
109 | cf::post_init { |
104 | cf::async_ext { |
110 | cf::async_ext { |
105 | my $schedule_interval = Coro::Event->timer (after => 1); |
111 | $Coro::current->{desc} = "worldmap updater"; |
106 | |
112 | |
107 | while () { |
113 | while () { |
108 | $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); |
114 | Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL; |
109 | $schedule_interval->next; |
|
|
110 | |
115 | |
111 | cf::get_slot 0.01, -50, "worldmap update"; |
116 | cf::get_slot 0.01, -50, "worldmap update"; |
112 | |
117 | |
113 | ++$GENCOUNT; |
118 | ++$GENCOUNT; |
114 | |
119 | |
115 | # recalculate player info |
120 | # recalculate player info |
116 | my %new; |
121 | my %new; |
117 | for (values %cf::PLAYER) { |
122 | for (values %cf::PLAYER) { |
118 | my $map = $_->ob->map |
123 | my $map = $_->ob->map |
119 | or next; |
124 | or next; |
120 | $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/ |
125 | $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/ |
121 | or next; |
126 | or next; |
122 | |
127 | |
123 | my $ob = $_->ob; |
128 | my $ob = $_->ob; |
124 | my $x = ($1 - 100) * 50 + $ob->x; |
129 | my $x = ($1 - 100) * 50 + $ob->x; |
125 | my $y = ($2 - 100) * 50 + $ob->y; |
130 | my $y = ($2 - 100) * 50 + $ob->y; |
126 | |
131 | |
127 | 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500 |
132 | 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500 |
128 | or next; |
133 | or next; |
129 | |
134 | |
130 | $x = int $x * $MAPW / 1500; |
135 | $x = int $x * $MAPW / 1500; |
131 | $y = int $y * $MAPH / 1500; |
136 | $y = int $y * $MAPH / 1500; |
132 | |
137 | |
133 | my $name = $ob->name; |
138 | my $name = $ob->name; |
134 | |
139 | |
135 | if (my $pi = delete $PLAYERINFO{$name}) { |
140 | if (my $pi = delete $PLAYERINFO{$name}) { |
136 | if ($pi->[0] == $x && $pi->[1] == $y) { |
141 | if ($pi->[0] == $x && $pi->[1] == $y) { |
137 | $new{$name} = $pi; |
142 | $new{$name} = $pi; |
138 | next; |
143 | next; |
|
|
144 | } |
139 | } |
145 | } |
|
|
146 | |
|
|
147 | $new{$name} = [$x, $y]; |
140 | } |
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 |
141 | |
155 | or next; |
142 | $new{$name} = [$x, $y]; |
156 | |
|
|
157 | update_worldmap $ns->{ws_worldmap} |
|
|
158 | if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility}; |
|
|
159 | } |
143 | } |
160 | } |
144 | |
|
|
145 | *PLAYERINFO = \%new; |
|
|
146 | |
|
|
147 | cf::get_slot 0.03, -50, "worldmap socket update"; |
|
|
148 | for (values %cf::PLAYER) { |
|
|
149 | my $ns = $_->ns |
|
|
150 | or next; |
|
|
151 | |
|
|
152 | update_worldmap $ns->{ws_worldmap} |
|
|
153 | if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility}; |
|
|
154 | } |
|
|
155 | } |
161 | }; |
156 | }; |
162 | }; |
157 | |
163 | |