… | |
… | |
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", |
… | |
… | |
67 | ::stop_game (); |
68 | ::stop_game (); |
68 | local $::PROFILE->{host} = $server; |
69 | local $::PROFILE->{host} = $server; |
69 | ::start_game (); |
70 | ::start_game (); |
70 | } |
71 | } |
71 | |
72 | |
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 { |
73 | sub editor_invoke { |
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
74 | my $editsup = $::CONN && $::CONN->{editor_support} |
83 | or return; |
75 | or return; |
84 | |
76 | |
85 | CFPlus::background { |
77 | CFPlus::background { |
86 | print "preparing editor startup...\n"; |
78 | print "preparing editor startup...\n"; |
87 | CFPlus::set_proxy; |
|
|
88 | |
79 | |
89 | my $server = $editsup->{gameserver} || "default"; |
80 | my $server = $editsup->{gameserver} || "default"; |
90 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
81 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
91 | |
82 | |
92 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
83 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
93 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
84 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
94 | |
85 | |
95 | print "map directory is $mapdir\n"; |
86 | print "map directory is $mapdir\n"; |
96 | print "lib directory is $libdir\n"; |
87 | print "lib directory is $libdir\n"; |
97 | |
88 | |
98 | require LWP::UserAgent; |
89 | my $ua = CFPlus::lwp_useragent; |
99 | |
|
|
100 | my $ua = LWP::UserAgent->new ( |
|
|
101 | agent => "cfplus $CFPlus::VERSION", |
|
|
102 | keep_alive => 1, |
|
|
103 | env_proxy => 1, |
|
|
104 | timeout => 30, |
|
|
105 | ); |
|
|
106 | |
90 | |
107 | for my $file (qw(archetypes crossfire.0)) { |
91 | for my $file (qw(archetypes crossfire.0)) { |
108 | my $url = "$editsup->{lib_root}$file"; |
92 | my $url = "$editsup->{lib_root}$file"; |
109 | print "mirroring $url...\n"; |
93 | print "mirroring $url...\n"; |
110 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
94 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
111 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
95 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
112 | } |
96 | } |
113 | |
97 | |
114 | if (1) { # upload a map |
98 | if (1) { # upload a map |
115 | my $mapname = $::CONN->{map_info}[0]; |
99 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
120 | |
104 | |
121 | print "getting map revision for $mapname...\n"; |
105 | print "getting map revision for $mapname...\n"; |
122 | |
106 | |
123 | # try to get the most recent head revision, what a hack, |
107 | # try to get the most recent head revision, what a hack, |
124 | # this should have been returned while downloading *sigh* |
108 | # this should have been returned while downloading *sigh* |
125 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$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; |
126 | |
110 | |
127 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
111 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
128 | my $rev = $1; |
112 | my $rev = $1; |
129 | |
113 | |
130 | print "downloading revision $rev...\n"; |
114 | print "downloading revision $rev...\n"; |
131 | |
115 | |
132 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
116 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
133 | |
117 | |
134 | my $meta = { |
118 | my $meta = { |
135 | %$editsup, |
119 | %$editsup, |
136 | path => $mapname, |
120 | path => $mapname, |
137 | revision => $rev, |
121 | revision => $rev, |
… | |
… | |
193 | |
177 | |
194 | if ($ev->{button} == 1) { |
178 | if ($ev->{button} == 1) { |
195 | $self->grab_focus; |
179 | $self->grab_focus; |
196 | return unless $::CONN; |
180 | return unless $::CONN; |
197 | |
181 | |
198 | 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}; |
199 | 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}; |
200 | |
184 | |
201 | $x -= int 0.5 * $self->{sw}; |
185 | $x -= CFPlus::floor $::MAP->w * 0.5; |
202 | $y -= int 0.5 * $self->{sh}; |
186 | $y -= CFPlus::floor $::MAP->h * 0.5; |
203 | |
187 | |
|
|
188 | if ($::CONN) { |
|
|
189 | if ($::IN_BUILD_MODE) { |
|
|
190 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
191 | } else { |
204 | $::CONN->lookat ($x, $y) |
192 | $::CONN->lookat ($x, $y) |
205 | if $::CONN; |
193 | } |
|
|
194 | } |
206 | |
195 | |
207 | } elsif ($ev->{button} == 2) { |
196 | } elsif ($ev->{button} == 2) { |
208 | $self->grab_focus; |
197 | $self->grab_focus; |
209 | return unless $::CONN; |
198 | return unless $::CONN; |
210 | |
199 | |
… | |
… | |
348 | ::toggle_player_page ($::SPELL_PAGE); |
337 | ::toggle_player_page ($::SPELL_PAGE); |
349 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
338 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
350 | ::toggle_player_page ($::INVENTORY_PAGE); |
339 | ::toggle_player_page ($::INVENTORY_PAGE); |
351 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
352 | $::SETUP_DIALOG->toggle_visibility; |
341 | $::SETUP_DIALOG->toggle_visibility; |
353 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
354 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
355 | sub { |
|
|
356 | my ($mod, $sym, $cmds) = @_; |
|
|
357 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
358 | }); |
|
|
359 | $::BIND_EDITOR->start; |
|
|
360 | $::BIND_EDITOR->show; |
|
|
361 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
362 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
363 | # $::BIND_EDITOR->stop; |
|
|
364 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
365 | # $::BIND_EDITOR->hide; |
|
|
366 | } elsif (!$::CONN) { |
342 | } elsif (!$::CONN) { |
367 | return 0; # bindings further down need a valid connection |
343 | return 0; # bindings further down need a valid connection |
368 | |
344 | |
369 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
345 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
370 | $::CONN->user_send ("stay fire"); |
346 | $::CONN->user_send ("stay fire"); |
… | |
… | |
375 | } elsif ($uni == 13) { |
351 | } elsif ($uni == 13) { |
376 | $::CONN->user_send ("examine"); |
352 | $::CONN->user_send ("examine"); |
377 | } elsif ($uni == ord ".") { |
353 | } elsif ($uni == ord ".") { |
378 | $::CONN->user_send ($self->{completer}{last_command}) |
354 | $::CONN->user_send ($self->{completer}{last_command}) |
379 | if exists $self->{completer}{last_command}; |
355 | if exists $self->{completer}{last_command}; |
380 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
356 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
381 | $::CONN->user_send ($_) for @$bind_cmd; |
357 | $::CONN->macro_send ($_) for @macros; |
382 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
358 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
383 | $::CONN->user_send ("rotateshoottype +"); |
359 | $::CONN->user_send ("rotateshoottype +"); |
384 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
385 | $::CONN->user_send ("rotateshoottype -"); |
361 | $::CONN->user_send ("rotateshoottype -"); |
386 | } elsif ($uni == ord '"') { |
362 | } elsif ($uni == ord '"') { |
… | |
… | |
446 | } |
422 | } |
447 | |
423 | |
448 | sub set_magicmap { |
424 | sub set_magicmap { |
449 | my ($self, $w, $h, $x, $y, $data) = @_; |
425 | my ($self, $w, $h, $x, $y, $data) = @_; |
450 | |
426 | |
451 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
427 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
452 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
428 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
453 | |
429 | |
454 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
430 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
455 | |
431 | |
456 | $self->update; |
432 | $self->update; |
457 | } |
433 | } |
… | |
… | |
468 | unless $focused || !$::FAST; |
444 | unless $focused || !$::FAST; |
469 | |
445 | |
470 | if (delete $self->{need_update}) { |
446 | if (delete $self->{need_update}) { |
471 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
447 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
472 | |
448 | |
|
|
449 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
450 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
451 | |
473 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
452 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
474 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
453 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
475 | |
454 | |
476 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
455 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
477 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
456 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
478 | |
457 | |
479 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
458 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
480 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
459 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
481 | |
460 | |
482 | if ($::CFG->{fow_enable}) { |
461 | if ($::CFG->{fow_enable}) { |
483 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
462 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
484 | |
463 | |
485 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
464 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
486 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
465 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
487 | glConvolutionFilter2D ( |
466 | glConvolutionFilter2D ( |
488 | GL_CONVOLUTION_2D, |
467 | GL_CONVOLUTION_2D, |
… | |
… | |
510 | |
489 | |
511 | glPushMatrix; |
490 | glPushMatrix; |
512 | glTranslate $sx0, $sy0; |
491 | glTranslate $sx0, $sy0; |
513 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
492 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
514 | |
493 | |
515 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
494 | $::MAP->draw ($dx, $dy, $sw, $sh); |
516 | |
495 | |
517 | glScale 32, 32; |
496 | glScale 32, 32; |
518 | |
497 | |
519 | if (my $tex = $self->{fow_texture}) { |
498 | if (my $tex = $self->{fow_texture}) { |
520 | glEnable GL_TEXTURE_2D; |
499 | glEnable GL_TEXTURE_2D; |
… | |
… | |
527 | } |
506 | } |
528 | |
507 | |
529 | if ($self->{magicmap}) { |
508 | if ($self->{magicmap}) { |
530 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
509 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
531 | |
510 | |
532 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
511 | $x += $::MAP->ox + $self->{dx}; |
533 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
512 | $y += $::MAP->oy + $self->{dy}; |
534 | |
513 | |
535 | glTranslate - $x - 1, - $y - 1; |
514 | glTranslate - $x - 1, - $y - 1; |
536 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
515 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
537 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
516 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
538 | } |
517 | } |
… | |
… | |
684 | |
663 | |
685 | if ($ev->{button} == 3) { |
664 | if ($ev->{button} == 3) { |
686 | (new CFPlus::UI::Menu |
665 | (new CFPlus::UI::Menu |
687 | items => [ |
666 | items => [ |
688 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
667 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
689 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
668 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
690 | ], |
669 | ], |
691 | )->popup ($ev); |
670 | )->popup ($ev); |
692 | return 1; |
671 | return 1; |
693 | } |
672 | } |
694 | 0 |
673 | 0 |