… | |
… | |
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::; |
|
|
14 | |
|
|
15 | sub ::T() { 32 } |
13 | |
16 | |
14 | my $magicmap_tex = |
17 | my $magicmap_tex = |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
18 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
19 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
20 | |
… | |
… | |
67 | ::stop_game (); |
70 | ::stop_game (); |
68 | local $::PROFILE->{host} = $server; |
71 | local $::PROFILE->{host} = $server; |
69 | ::start_game (); |
72 | ::start_game (); |
70 | } |
73 | } |
71 | |
74 | |
72 | sub check_lwp($) { |
|
|
73 | my ($res) = @_; |
|
|
74 | |
|
|
75 | $res->is_error |
|
|
76 | and die $res->status_line; |
|
|
77 | |
|
|
78 | $res |
|
|
79 | } |
|
|
80 | |
|
|
81 | sub editor_invoke { |
75 | sub editor_invoke { |
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
76 | my $editsup = $::CONN && $::CONN->{editor_support} |
83 | or return; |
77 | or return; |
84 | |
78 | |
85 | # putting the password into the env is somewhat tasteless |
79 | CFPlus::background { |
86 | # local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
|
|
87 | # local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
88 | # local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
89 | |
|
|
90 | my ($pid, $fh); |
|
|
91 | unless ($pid = open $fh, "-|:utf8", "-") { |
|
|
92 | $SIG{__DIE__} = sub { |
|
|
93 | warn "@_\n"; |
|
|
94 | CFPlus::_exit 99; |
|
|
95 | }; |
|
|
96 | |
|
|
97 | open STDERR, ">&STDOUT"; |
|
|
98 | binmode STDOUT, ":utf8"; |
|
|
99 | binmode STDERR, ":utf8"; |
|
|
100 | close $fh; |
|
|
101 | |
|
|
102 | $| = 1; |
|
|
103 | print "preparing editor startup...\n"; |
80 | print "preparing editor startup...\n"; |
104 | CFPlus::set_proxy; |
|
|
105 | |
81 | |
106 | my $server = $editsup->{gameserver} || "default"; |
82 | my $server = $editsup->{gameserver} || "default"; |
107 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
83 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
108 | |
84 | |
109 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
85 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
110 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
86 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
111 | |
87 | |
112 | print "map directory is $mapdir\n"; |
88 | print "map directory is $mapdir\n"; |
113 | print "lib directory is $libdir\n"; |
89 | print "lib directory is $libdir\n"; |
114 | |
90 | |
115 | require LWP::UserAgent; |
91 | my $ua = CFPlus::lwp_useragent; |
116 | |
|
|
117 | my $ua = LWP::UserAgent->new ( |
|
|
118 | agent => "cfplus $CFPlus::VERSION", |
|
|
119 | keep_alive => 1, |
|
|
120 | env_proxy => 1, |
|
|
121 | timeout => 30, |
|
|
122 | ); |
|
|
123 | |
92 | |
124 | for my $file (qw(archetypes crossfire.0)) { |
93 | for my $file (qw(archetypes crossfire.0)) { |
125 | my $url = "$editsup->{lib_root}$file"; |
94 | my $url = "$editsup->{lib_root}$file"; |
126 | print "mirroring $url...\n"; |
95 | print "mirroring $url...\n"; |
127 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
96 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
128 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
97 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
129 | } |
98 | } |
130 | |
99 | |
131 | if (1) { # upload a map |
100 | if (1) { # upload a map |
132 | my $mapname = $::CONN->{map_info}[0]; |
101 | my $mapname = $::CONN->{map_info}[0]; |
133 | |
102 | |
|
|
103 | my $mappath = "$mapdir/$mapname"; |
|
|
104 | |
|
|
105 | -e $mappath and die "$mappath already exists\n"; |
|
|
106 | |
134 | print "getting map revision for $mapname...\n"; |
107 | print "getting map revision for $mapname...\n"; |
135 | |
108 | |
136 | # try to get the most recent head revision, what a hack, |
109 | # try to get the most recent head revision, what a hack, |
137 | # this should have been returned while downloading *sigh* |
110 | # this should have been returned while downloading *sigh* |
138 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
111 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
139 | |
112 | |
140 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
113 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
141 | my $rev = $1; |
114 | my $rev = $1; |
142 | |
115 | |
143 | print "downloading revision $rev...\n"; |
116 | print "downloading revision $rev...\n"; |
144 | |
117 | |
145 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
118 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
119 | |
|
|
120 | my $meta = { |
|
|
121 | %$editsup, |
|
|
122 | path => $mapname, |
|
|
123 | revision => $rev, |
|
|
124 | cf_login => $::PROFILE->{user}, |
|
|
125 | }; |
|
|
126 | |
|
|
127 | require File::Basename; |
|
|
128 | require File::Path; |
|
|
129 | |
|
|
130 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
131 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
132 | or die "$mappath.meta: $!\n"; |
|
|
133 | print $fh CFPlus::to_json $meta; |
|
|
134 | close $fh; |
|
|
135 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
136 | or die "$mappath: $!\n"; |
|
|
137 | print $fh $map; |
|
|
138 | close $fh; |
|
|
139 | |
|
|
140 | print "saved as $mappath\n"; |
|
|
141 | |
|
|
142 | print "invoking editor...\n"; |
|
|
143 | exec "/root/s2/gce $mappath";#d# |
146 | |
144 | |
147 | # now upload it |
145 | # now upload it |
148 | # require HTTP::Request::Common; |
146 | # require HTTP::Request::Common; |
149 | # |
147 | # |
150 | # my $res = $ua->post ( |
148 | # my $res = $ua->post ( |
… | |
… | |
171 | # } |
169 | # } |
172 | } else { |
170 | } else { |
173 | die "viewvc parse error, unable to detect revision\n"; |
171 | die "viewvc parse error, unable to detect revision\n"; |
174 | } |
172 | } |
175 | } |
173 | } |
176 | |
|
|
177 | print "invoking editor...\n"; |
|
|
178 | exec "/root/s2/gce";#d# |
|
|
179 | |
|
|
180 | CFPlus::_exit; |
|
|
181 | } |
|
|
182 | |
|
|
183 | my $buffer; |
|
|
184 | |
|
|
185 | Event->io (fd => $fh, poll => 'r', cb => sub { |
|
|
186 | unless (sysread $fh, $buffer, 4096, length $buffer) { |
|
|
187 | $_[0]->w->cancel; |
|
|
188 | $buffer .= "done\n"; |
|
|
189 | } |
|
|
190 | |
|
|
191 | while ($buffer =~ s/^(.*)\n//) { |
|
|
192 | ::message ({ |
|
|
193 | markup => "editor($pid): " . CFPlus::asxml $1, |
|
|
194 | }); |
|
|
195 | } |
|
|
196 | }); |
174 | } |
197 | } |
175 | } |
198 | |
176 | |
199 | sub invoke_button_down { |
177 | sub invoke_button_down { |
200 | my ($self, $ev, $x, $y) = @_; |
178 | my ($self, $ev, $x, $y) = @_; |
201 | |
179 | |
202 | if ($ev->{button} == 1) { |
180 | if ($ev->{button} == 1) { |
203 | $self->grab_focus; |
181 | $self->grab_focus; |
204 | return unless $::CONN; |
182 | return unless $::CONN; |
205 | |
183 | |
206 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
184 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
207 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
185 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
208 | |
186 | |
209 | $x -= int 0.5 * $self->{sw}; |
187 | $x -= CFPlus::floor $::MAP->w * 0.5; |
210 | $y -= int 0.5 * $self->{sh}; |
188 | $y -= CFPlus::floor $::MAP->h * 0.5; |
211 | |
189 | |
|
|
190 | if ($::CONN) { |
|
|
191 | if ($::IN_BUILD_MODE) { |
|
|
192 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
193 | } else { |
212 | $::CONN->lookat ($x, $y) |
194 | $::CONN->lookat ($x, $y) |
213 | if $::CONN; |
195 | } |
|
|
196 | } |
214 | |
197 | |
215 | } elsif ($ev->{button} == 2) { |
198 | } elsif ($ev->{button} == 2) { |
216 | $self->grab_focus; |
199 | $self->grab_focus; |
217 | return unless $::CONN; |
200 | return unless $::CONN; |
218 | |
201 | |
… | |
… | |
305 | 1 |
288 | 1 |
306 | } |
289 | } |
307 | |
290 | |
308 | sub size_request { |
291 | sub size_request { |
309 | ( |
292 | ( |
310 | 32 * CFPlus::ceil $::WIDTH / 32, |
293 | ::T * CFPlus::ceil $::WIDTH / ::T, |
311 | 32 * CFPlus::ceil $::HEIGHT / 32, |
294 | ::T * CFPlus::ceil $::HEIGHT / ::T, |
312 | ) |
295 | ) |
313 | } |
296 | } |
314 | |
297 | |
315 | sub update { |
298 | sub update { |
316 | my ($self) = @_; |
299 | my ($self) = @_; |
… | |
… | |
342 | my $sym = $ev->{sym}; |
325 | my $sym = $ev->{sym}; |
343 | my $uni = $ev->{unicode}; |
326 | my $uni = $ev->{unicode}; |
344 | |
327 | |
345 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
328 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
346 | |
329 | |
347 | if ($uni == ord "\t") { |
330 | if ($sym == 9) { |
348 | $::PL_WINDOW->toggle_visibility; |
331 | ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; |
349 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
332 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
350 | $::HELP_WINDOW->toggle_visibility; |
333 | $::HELP_WINDOW->toggle_visibility; |
351 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
334 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
352 | ::toggle_player_page ($::STATS_PAGE); |
335 | ::toggle_player_page ($::STATS_PAGE); |
353 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
336 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
… | |
… | |
356 | ::toggle_player_page ($::SPELL_PAGE); |
339 | ::toggle_player_page ($::SPELL_PAGE); |
357 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
358 | ::toggle_player_page ($::INVENTORY_PAGE); |
341 | ::toggle_player_page ($::INVENTORY_PAGE); |
359 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
342 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
360 | $::SETUP_DIALOG->toggle_visibility; |
343 | $::SETUP_DIALOG->toggle_visibility; |
361 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
362 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
363 | sub { |
|
|
364 | my ($mod, $sym, $cmds) = @_; |
|
|
365 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
366 | }); |
|
|
367 | $::BIND_EDITOR->start; |
|
|
368 | $::BIND_EDITOR->show; |
|
|
369 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
370 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
371 | # $::BIND_EDITOR->stop; |
|
|
372 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
373 | # $::BIND_EDITOR->hide; |
|
|
374 | } elsif (!$::CONN) { |
344 | } elsif (!$::CONN) { |
375 | return 0; # bindings further down need a valid connection |
345 | return 0; # bindings further down need a valid connection |
376 | |
346 | |
377 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
347 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
378 | $::CONN->user_send ("stay fire"); |
348 | $::CONN->user_send ("stay fire"); |
… | |
… | |
383 | } elsif ($uni == 13) { |
353 | } elsif ($uni == 13) { |
384 | $::CONN->user_send ("examine"); |
354 | $::CONN->user_send ("examine"); |
385 | } elsif ($uni == ord ".") { |
355 | } elsif ($uni == ord ".") { |
386 | $::CONN->user_send ($self->{completer}{last_command}) |
356 | $::CONN->user_send ($self->{completer}{last_command}) |
387 | if exists $self->{completer}{last_command}; |
357 | if exists $self->{completer}{last_command}; |
388 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
358 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
389 | $::CONN->user_send ($_) for @$bind_cmd; |
359 | $::CONN->macro_send ($_) for @macros; |
390 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
391 | $::CONN->user_send ("rotateshoottype +"); |
361 | $::CONN->user_send ("rotateshoottype +"); |
392 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
393 | $::CONN->user_send ("rotateshoottype -"); |
363 | $::CONN->user_send ("rotateshoottype -"); |
|
|
364 | } elsif ($uni == ord '!') { |
|
|
365 | $self->{completer}->set_prefix ("shout "); |
|
|
366 | $self->{completer}->show; |
394 | } elsif ($uni == ord '"') { |
367 | } elsif ($uni == ord '"') { |
395 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
368 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
396 | $self->{completer}->show; |
369 | $self->{completer}->show; |
397 | } elsif ($uni == ord "'") { |
370 | } elsif ($uni == ord "'") { |
398 | $self->{completer}->set_prefix (""); |
371 | $self->{completer}->set_prefix (""); |
… | |
… | |
454 | } |
427 | } |
455 | |
428 | |
456 | sub set_magicmap { |
429 | sub set_magicmap { |
457 | my ($self, $w, $h, $x, $y, $data) = @_; |
430 | my ($self, $w, $h, $x, $y, $data) = @_; |
458 | |
431 | |
459 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
432 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
460 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
433 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
461 | |
434 | |
462 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
435 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
463 | |
436 | |
464 | $self->update; |
437 | $self->update; |
465 | } |
438 | } |
… | |
… | |
474 | |
447 | |
475 | return |
448 | return |
476 | unless $focused || !$::FAST; |
449 | unless $focused || !$::FAST; |
477 | |
450 | |
478 | if (delete $self->{need_update}) { |
451 | if (delete $self->{need_update}) { |
479 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
452 | my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale}; |
480 | |
453 | |
|
|
454 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
455 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
456 | |
481 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
457 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
482 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
458 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
483 | |
459 | |
484 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
460 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
485 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
461 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
486 | |
462 | |
487 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
463 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
488 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
464 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
489 | |
465 | |
490 | if ($::CFG->{fow_enable}) { |
466 | if ($::CFG->{fow_enable}) { |
491 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
467 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
492 | |
468 | |
493 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
469 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
494 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
470 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
495 | glConvolutionFilter2D ( |
471 | glConvolutionFilter2D ( |
496 | GL_CONVOLUTION_2D, |
472 | GL_CONVOLUTION_2D, |
… | |
… | |
518 | |
494 | |
519 | glPushMatrix; |
495 | glPushMatrix; |
520 | glTranslate $sx0, $sy0; |
496 | glTranslate $sx0, $sy0; |
521 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
522 | |
498 | |
523 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, ::T); |
524 | |
500 | |
525 | glScale 32, 32; |
501 | glScale ::T, ::T; |
526 | |
502 | |
527 | if (my $tex = $self->{fow_texture}) { |
503 | if (my $tex = $self->{fow_texture}) { |
528 | glEnable GL_TEXTURE_2D; |
504 | glEnable GL_TEXTURE_2D; |
529 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
505 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
530 | |
506 | |
… | |
… | |
535 | } |
511 | } |
536 | |
512 | |
537 | if ($self->{magicmap}) { |
513 | if ($self->{magicmap}) { |
538 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
514 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
539 | |
515 | |
540 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
516 | $x += $::MAP->ox + $self->{dx}; |
541 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
517 | $y += $::MAP->oy + $self->{dy}; |
542 | |
518 | |
543 | glTranslate - $x - 1, - $y - 1; |
519 | glTranslate - $x - 1, - $y - 1; |
544 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
520 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
545 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
521 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
546 | } |
522 | } |
… | |
… | |
605 | |
581 | |
606 | $::MAP or return; |
582 | $::MAP or return; |
607 | |
583 | |
608 | my ($w, $h) = @$self{qw(w h)}; |
584 | my ($w, $h) = @$self{qw(w h)}; |
609 | |
585 | |
610 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
586 | my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; |
611 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
587 | my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; |
612 | |
588 | |
613 | my $sx = int $::CFG->{map_shift_x} / 32; |
589 | my $sx = int $::CFG->{map_shift_x} / ::T; |
614 | my $sy = int $::CFG->{map_shift_y} / 32; |
590 | my $sy = int $::CFG->{map_shift_y} / ::T; |
615 | |
591 | |
616 | my $ox = 0.5 * ($w - $sw); |
592 | my $ox = 0.5 * ($w - $sw); |
617 | my $oy = 0.5 * ($h - $sh); |
593 | my $oy = 0.5 * ($h - $sh); |
618 | |
594 | |
619 | glEnable GL_BLEND; |
595 | glEnable GL_BLEND; |
… | |
… | |
692 | |
668 | |
693 | if ($ev->{button} == 3) { |
669 | if ($ev->{button} == 3) { |
694 | (new CFPlus::UI::Menu |
670 | (new CFPlus::UI::Menu |
695 | items => [ |
671 | items => [ |
696 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
672 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
697 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
673 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
698 | ], |
674 | ], |
699 | )->popup ($ev); |
675 | )->popup ($ev); |
700 | return 1; |
676 | return 1; |
701 | } |
677 | } |
702 | 0 |
678 | 0 |