… | |
… | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
9 | use CFPlus::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
|
|
11 | use CFPlus::Macro; |
11 | |
12 | |
12 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = CFPlus::UI::Base::; |
13 | |
14 | |
14 | my $magicmap_tex = |
15 | my $magicmap_tex = |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
… | |
… | |
59 | |
60 | |
60 | $self->{completer}->hide |
61 | $self->{completer}->hide |
61 | if $self->{completer}; |
62 | if $self->{completer}; |
62 | } |
63 | } |
63 | |
64 | |
64 | sub test_server_login { |
65 | sub server_login { |
65 | return unless |
66 | my ($server) = @_; |
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
67 | |
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
68 | ::stop_game (); |
70 | local $::PROFILE->{host} = $server; |
69 | local $::PROFILE->{host} = $server; |
71 | ::start_game (); |
70 | ::start_game (); |
72 | } |
71 | } |
73 | |
72 | |
74 | sub editor_invoke { |
73 | sub editor_invoke { |
75 | return unless $::CONN; |
74 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
75 | or return; |
76 | |
76 | |
77 | # putting the password into the env is somewhat tasteless |
77 | CFPlus::background { |
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
78 | print "preparing editor startup...\n"; |
79 | local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
80 | local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
81 | local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root}; |
|
|
82 | |
79 | |
83 | CFPlus::set_proxy; |
80 | my $server = $editsup->{gameserver} || "default"; |
|
|
81 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
84 | |
82 | |
85 | my $map = "map:$::CONN->{map_info}[0]"; |
83 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
84 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
86 | |
85 | |
87 | if (fork == 0) { |
86 | print "map directory is $mapdir\n"; |
88 | $SIG{__DIE__} = sub { |
87 | print "lib directory is $libdir\n"; |
89 | warn "@_"; |
88 | |
90 | CFPlus::_exit 99; |
89 | my $ua = CFPlus::lwp_useragent; |
|
|
90 | |
|
|
91 | for my $file (qw(archetypes crossfire.0)) { |
|
|
92 | my $url = "$editsup->{lib_root}$file"; |
|
|
93 | print "mirroring $url...\n"; |
|
|
94 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
|
|
95 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
91 | }; |
96 | } |
92 | |
97 | |
93 | # TODO: move into editor |
98 | if (1) { # upload a map |
94 | require LWP::UserAgent; |
99 | my $mapname = $::CONN->{map_info}[0]; |
95 | |
100 | |
96 | my $ua = LWP::UserAgent->new ( |
101 | my $mappath = "$mapdir/$mapname"; |
97 | agent => "cfplus $CFPlus::VERSION", |
|
|
98 | keep_alive => 1, |
|
|
99 | env_proxy => 1, |
|
|
100 | ); |
|
|
101 | |
102 | |
102 | if ($map =~ /^map:(.*)/) { |
103 | -e $mappath and die "$mappath already exists\n"; |
103 | my $mapname = $1; |
104 | |
|
|
105 | print "getting map revision for $mapname...\n"; |
|
|
106 | |
104 | # try to get the most recent head revision, what a hack |
107 | # try to get the most recent head revision, what a hack, |
|
|
108 | # this should have been returned while downloading *sigh* |
105 | my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; |
109 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
106 | |
110 | |
107 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
111 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
108 | my $rev = $1; |
112 | my $rev = $1; |
109 | my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; |
113 | |
110 | warn "revision is $rev " .(length $map)."\n";#d# |
114 | print "downloading revision $rev...\n"; |
|
|
115 | |
|
|
116 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
117 | |
|
|
118 | my $meta = { |
|
|
119 | %$editsup, |
|
|
120 | path => $mapname, |
|
|
121 | revision => $rev, |
|
|
122 | cf_login => $::PROFILE->{user}, |
|
|
123 | }; |
|
|
124 | |
|
|
125 | require File::Basename; |
|
|
126 | require File::Path; |
|
|
127 | |
|
|
128 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
129 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
130 | or die "$mappath.meta: $!\n"; |
|
|
131 | print $fh CFPlus::to_json $meta; |
|
|
132 | close $fh; |
|
|
133 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
134 | or die "$mappath: $!\n"; |
|
|
135 | print $fh $map; |
|
|
136 | close $fh; |
|
|
137 | |
|
|
138 | print "saved as $mappath\n"; |
|
|
139 | |
|
|
140 | print "invoking editor...\n"; |
|
|
141 | exec "/root/s2/gce $mappath";#d# |
111 | |
142 | |
112 | # now upload it |
143 | # now upload it |
113 | my $comment = "some comment"; |
|
|
114 | |
|
|
115 | require HTTP::Request::Common; |
144 | # require HTTP::Request::Common; |
116 | |
145 | # |
117 | my $res = $ua->post ( |
146 | # my $res = $ua->post ( |
118 | $ENV{CFPLUS_UPLOAD}, |
147 | # $ENV{CFPLUS_UPLOAD}, |
119 | Content_Type => 'multipart/form-data', |
148 | # Content_Type => 'multipart/form-data', |
120 | Content => [ |
149 | # Content => [ |
121 | path => $mapname, |
150 | # path => $mapname, |
122 | mapdir => $ENV{CROSSFIRE_MAPDIR}, |
151 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
123 | map => $map, |
152 | # map => $map, |
124 | revision => $rev, |
153 | # revision => $rev, |
125 | cf_login => $ENV{CFPLUS_LOGIN}, |
154 | # cf_login => $ENV{CFPLUS_LOGIN}, |
126 | cf_password => $ENV{CFPLUS_PASSWORD}, |
155 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
127 | comment => "", |
156 | # comment => "", |
128 | ] |
157 | # ] |
129 | ); |
158 | # ); |
130 | |
159 | # |
131 | if ($res->is_error) { |
160 | # if ($res->is_error) { |
132 | # fatal condition |
161 | # # fatal condition |
133 | warn $res->status_line; |
162 | # warn $res->status_line; |
134 | } else { |
163 | # } else { |
135 | # script replies are marked as {{..}} |
164 | # # script replies are marked as {{..}} |
136 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
165 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
137 | warn map "$_\n", @msgs; |
166 | # warn map "$_\n", @msgs; |
138 | } |
167 | # } |
139 | } else { |
168 | } else { |
140 | # error, could not detect revision |
169 | die "viewvc parse error, unable to detect revision\n"; |
141 | } |
170 | } |
142 | } |
171 | } |
143 | |
|
|
144 | CFPlus::_exit; |
|
|
145 | } |
172 | } |
146 | } |
173 | } |
147 | |
174 | |
148 | sub invoke_button_down { |
175 | sub invoke_button_down { |
149 | my ($self, $ev, $x, $y) = @_; |
176 | my ($self, $ev, $x, $y) = @_; |
150 | |
177 | |
151 | if ($ev->{button} == 1) { |
178 | if ($ev->{button} == 1) { |
152 | $self->grab_focus; |
179 | $self->grab_focus; |
153 | return unless $::CONN; |
180 | return unless $::CONN; |
154 | |
181 | |
155 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
182 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
156 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
183 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
157 | |
184 | |
158 | $x -= int 0.5 * $self->{sw}; |
185 | $x -= CFPlus::floor $::MAP->w * 0.5; |
159 | $y -= int 0.5 * $self->{sh}; |
186 | $y -= CFPlus::floor $::MAP->h * 0.5; |
160 | |
187 | |
|
|
188 | if ($::CONN) { |
|
|
189 | if ($::IN_BUILD_MODE) { |
|
|
190 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
191 | } else { |
161 | $::CONN->lookat ($x, $y) |
192 | $::CONN->lookat ($x, $y) |
162 | if $::CONN; |
193 | } |
|
|
194 | } |
163 | |
195 | |
164 | } elsif ($ev->{button} == 2) { |
196 | } elsif ($ev->{button} == 2) { |
165 | $self->grab_focus; |
197 | $self->grab_focus; |
166 | return unless $::CONN; |
198 | return unless $::CONN; |
167 | |
199 | |
… | |
… | |
177 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
209 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
178 | |
210 | |
179 | $self->update; |
211 | $self->update; |
180 | }; |
212 | }; |
181 | } elsif ($ev->{button} == 3) { |
213 | } elsif ($ev->{button} == 3) { |
182 | (new CFPlus::UI::Menu |
214 | my @items = ( |
183 | items => [ |
|
|
184 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
215 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
185 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
216 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
186 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
217 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
187 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
218 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
188 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
219 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
… | |
… | |
192 | $::PICKUP_ENABLE->{state} |
223 | $::PICKUP_ENABLE->{state} |
193 | ? "Disable automatic pickup" |
224 | ? "Disable automatic pickup" |
194 | : "Enable automatic pickup", |
225 | : "Enable automatic pickup", |
195 | sub { $::PICKUP_ENABLE->toggle } |
226 | sub { $::PICKUP_ENABLE->toggle } |
196 | ], |
227 | ], |
197 | $::CONN && length $::CONN->{cvs_root} |
228 | ); |
|
|
229 | |
|
|
230 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
231 | push @items, [ |
198 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
232 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
199 | \&editor_invoke] |
233 | \&editor_invoke, |
200 | : (), |
234 | ]; |
201 | $::CONN && length $::CONN->{test_server} |
235 | |
|
|
236 | for my $type (qw(test name)) { |
|
|
237 | $::CONN->{editor_support}{type} ne $type |
|
|
238 | or next; |
|
|
239 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
240 | or next; |
|
|
241 | |
|
|
242 | push @items, [ |
202 | ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", |
243 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
203 | \&test_server_login] |
244 | sub { server_login $server }, |
204 | : (), |
245 | ]; |
|
|
246 | } |
|
|
247 | } |
|
|
248 | |
|
|
249 | push @items, |
205 | ["Quit", |
250 | ["Quit", |
206 | sub { |
251 | sub { |
207 | if ($::CONN) { |
252 | if ($::CONN) { |
208 | &::open_quit_dialog; |
253 | &::open_quit_dialog; |
209 | } else { |
254 | } else { |
210 | exit; |
255 | exit; |
211 | } |
|
|
212 | } |
256 | } |
213 | ], |
257 | } |
214 | ], |
258 | ], |
|
|
259 | ; |
|
|
260 | |
|
|
261 | (new CFPlus::UI::Menu |
|
|
262 | items => \@items, |
215 | )->popup ($ev); |
263 | )->popup ($ev); |
216 | } |
264 | } |
217 | |
265 | |
218 | 1 |
266 | 1 |
219 | } |
267 | } |
… | |
… | |
275 | my $sym = $ev->{sym}; |
323 | my $sym = $ev->{sym}; |
276 | my $uni = $ev->{unicode}; |
324 | my $uni = $ev->{unicode}; |
277 | |
325 | |
278 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
326 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
279 | |
327 | |
280 | if ($uni == ord "\t") { |
328 | if ($sym == 9) { |
281 | $::PL_WINDOW->toggle_visibility; |
329 | ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; |
282 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
330 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
283 | $::HELP_WINDOW->toggle_visibility; |
331 | $::HELP_WINDOW->toggle_visibility; |
284 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
332 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
285 | ::toggle_player_page ($::STATS_PAGE); |
333 | ::toggle_player_page ($::STATS_PAGE); |
286 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
334 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
… | |
… | |
289 | ::toggle_player_page ($::SPELL_PAGE); |
337 | ::toggle_player_page ($::SPELL_PAGE); |
290 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
338 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
291 | ::toggle_player_page ($::INVENTORY_PAGE); |
339 | ::toggle_player_page ($::INVENTORY_PAGE); |
292 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
293 | $::SETUP_DIALOG->toggle_visibility; |
341 | $::SETUP_DIALOG->toggle_visibility; |
294 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
295 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
296 | sub { |
|
|
297 | my ($mod, $sym, $cmds) = @_; |
|
|
298 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
299 | }); |
|
|
300 | $::BIND_EDITOR->start; |
|
|
301 | $::BIND_EDITOR->show; |
|
|
302 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
303 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
304 | # $::BIND_EDITOR->stop; |
|
|
305 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
306 | # $::BIND_EDITOR->hide; |
|
|
307 | } elsif (!$::CONN) { |
342 | } elsif (!$::CONN) { |
308 | return 0; # bindings further down need a valid connection |
343 | return 0; # bindings further down need a valid connection |
309 | |
344 | |
310 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
345 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
311 | $::CONN->user_send ("stay fire"); |
346 | $::CONN->user_send ("stay fire"); |
… | |
… | |
316 | } elsif ($uni == 13) { |
351 | } elsif ($uni == 13) { |
317 | $::CONN->user_send ("examine"); |
352 | $::CONN->user_send ("examine"); |
318 | } elsif ($uni == ord ".") { |
353 | } elsif ($uni == ord ".") { |
319 | $::CONN->user_send ($self->{completer}{last_command}) |
354 | $::CONN->user_send ($self->{completer}{last_command}) |
320 | if exists $self->{completer}{last_command}; |
355 | if exists $self->{completer}{last_command}; |
321 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
356 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
322 | $::CONN->user_send ($_) for @$bind_cmd; |
357 | $::CONN->macro_send ($_) for @macros; |
323 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
358 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
324 | $::CONN->user_send ("rotateshoottype +"); |
359 | $::CONN->user_send ("rotateshoottype +"); |
325 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
326 | $::CONN->user_send ("rotateshoottype -"); |
361 | $::CONN->user_send ("rotateshoottype -"); |
|
|
362 | } elsif ($uni == ord '!') { |
|
|
363 | $self->{completer}->set_prefix ("shout "); |
|
|
364 | $self->{completer}->show; |
327 | } elsif ($uni == ord '"') { |
365 | } elsif ($uni == ord '"') { |
328 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
366 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
329 | $self->{completer}->show; |
367 | $self->{completer}->show; |
330 | } elsif ($uni == ord "'") { |
368 | } elsif ($uni == ord "'") { |
331 | $self->{completer}->set_prefix (""); |
369 | $self->{completer}->set_prefix (""); |
… | |
… | |
387 | } |
425 | } |
388 | |
426 | |
389 | sub set_magicmap { |
427 | sub set_magicmap { |
390 | my ($self, $w, $h, $x, $y, $data) = @_; |
428 | my ($self, $w, $h, $x, $y, $data) = @_; |
391 | |
429 | |
392 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
430 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
393 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
431 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
394 | |
432 | |
395 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
433 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
396 | |
434 | |
397 | $self->update; |
435 | $self->update; |
398 | } |
436 | } |
… | |
… | |
409 | unless $focused || !$::FAST; |
447 | unless $focused || !$::FAST; |
410 | |
448 | |
411 | if (delete $self->{need_update}) { |
449 | if (delete $self->{need_update}) { |
412 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
450 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
413 | |
451 | |
|
|
452 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
453 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
454 | |
414 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
455 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
415 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
456 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
416 | |
457 | |
417 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
458 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
418 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
459 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
419 | |
460 | |
420 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
461 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
421 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
462 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
422 | |
463 | |
423 | if ($::CFG->{fow_enable}) { |
464 | if ($::CFG->{fow_enable}) { |
424 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
465 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
425 | |
466 | |
426 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
467 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
427 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
468 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
428 | glConvolutionFilter2D ( |
469 | glConvolutionFilter2D ( |
429 | GL_CONVOLUTION_2D, |
470 | GL_CONVOLUTION_2D, |
… | |
… | |
451 | |
492 | |
452 | glPushMatrix; |
493 | glPushMatrix; |
453 | glTranslate $sx0, $sy0; |
494 | glTranslate $sx0, $sy0; |
454 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
495 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
455 | |
496 | |
456 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
497 | $::MAP->draw ($dx, $dy, $sw, $sh); |
457 | |
498 | |
458 | glScale 32, 32; |
499 | glScale 32, 32; |
459 | |
500 | |
460 | if (my $tex = $self->{fow_texture}) { |
501 | if (my $tex = $self->{fow_texture}) { |
461 | glEnable GL_TEXTURE_2D; |
502 | glEnable GL_TEXTURE_2D; |
… | |
… | |
468 | } |
509 | } |
469 | |
510 | |
470 | if ($self->{magicmap}) { |
511 | if ($self->{magicmap}) { |
471 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
512 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
472 | |
513 | |
473 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
514 | $x += $::MAP->ox + $self->{dx}; |
474 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
515 | $y += $::MAP->oy + $self->{dy}; |
475 | |
516 | |
476 | glTranslate - $x - 1, - $y - 1; |
517 | glTranslate - $x - 1, - $y - 1; |
477 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
518 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
478 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
519 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
479 | } |
520 | } |
… | |
… | |
625 | |
666 | |
626 | if ($ev->{button} == 3) { |
667 | if ($ev->{button} == 3) { |
627 | (new CFPlus::UI::Menu |
668 | (new CFPlus::UI::Menu |
628 | items => [ |
669 | items => [ |
629 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
670 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
630 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
671 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
631 | ], |
672 | ], |
632 | )->popup ($ev); |
673 | )->popup ($ev); |
633 | return 1; |
674 | return 1; |
634 | } |
675 | } |
635 | 0 |
676 | 0 |
… | |
… | |
836 | |
877 | |
837 | $self->SUPER::_draw; |
878 | $self->SUPER::_draw; |
838 | } |
879 | } |
839 | |
880 | |
840 | 1 |
881 | 1 |
|
|
882 | |