… | |
… | |
67 | ::stop_game (); |
67 | ::stop_game (); |
68 | local $::PROFILE->{host} = $server; |
68 | local $::PROFILE->{host} = $server; |
69 | ::start_game (); |
69 | ::start_game (); |
70 | } |
70 | } |
71 | |
71 | |
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 { |
72 | sub editor_invoke { |
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
73 | my $editsup = $::CONN && $::CONN->{editor_support} |
83 | or return; |
74 | or return; |
84 | |
75 | |
85 | CFPlus::background { |
76 | CFPlus::background { |
86 | print "preparing editor startup...\n"; |
77 | print "preparing editor startup...\n"; |
87 | CFPlus::set_proxy; |
|
|
88 | |
78 | |
89 | my $server = $editsup->{gameserver} || "default"; |
79 | my $server = $editsup->{gameserver} || "default"; |
90 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
91 | |
81 | |
92 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
82 | 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; |
83 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
94 | |
84 | |
95 | print "map directory is $mapdir\n"; |
85 | print "map directory is $mapdir\n"; |
96 | print "lib directory is $libdir\n"; |
86 | print "lib directory is $libdir\n"; |
97 | |
87 | |
98 | require LWP::UserAgent; |
88 | 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 | |
89 | |
107 | for my $file (qw(archetypes crossfire.0)) { |
90 | for my $file (qw(archetypes crossfire.0)) { |
108 | my $url = "$editsup->{lib_root}$file"; |
91 | my $url = "$editsup->{lib_root}$file"; |
109 | print "mirroring $url...\n"; |
92 | print "mirroring $url...\n"; |
110 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
93 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
111 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
94 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
112 | } |
95 | } |
113 | |
96 | |
114 | if (1) { # upload a map |
97 | if (1) { # upload a map |
115 | my $mapname = $::CONN->{map_info}[0]; |
98 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
120 | |
103 | |
121 | print "getting map revision for $mapname...\n"; |
104 | print "getting map revision for $mapname...\n"; |
122 | |
105 | |
123 | # try to get the most recent head revision, what a hack, |
106 | # try to get the most recent head revision, what a hack, |
124 | # this should have been returned while downloading *sigh* |
107 | # 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; |
108 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
126 | |
109 | |
127 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
128 | my $rev = $1; |
111 | my $rev = $1; |
129 | |
112 | |
130 | print "downloading revision $rev...\n"; |
113 | print "downloading revision $rev...\n"; |
131 | |
114 | |
132 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
115 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
133 | |
116 | |
134 | my $meta = { |
117 | my $meta = { |
135 | %$editsup, |
118 | %$editsup, |
136 | path => $mapname, |
119 | path => $mapname, |
137 | revision => $rev, |
120 | revision => $rev, |
… | |
… | |
193 | |
176 | |
194 | if ($ev->{button} == 1) { |
177 | if ($ev->{button} == 1) { |
195 | $self->grab_focus; |
178 | $self->grab_focus; |
196 | return unless $::CONN; |
179 | return unless $::CONN; |
197 | |
180 | |
198 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
181 | 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}; |
182 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
200 | |
183 | |
201 | $x -= int 0.5 * $self->{sw}; |
184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
202 | $y -= int 0.5 * $self->{sh}; |
185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
203 | |
186 | |
|
|
187 | if ($::CONN) { |
|
|
188 | if ($::IN_BUILD_MODE) { |
|
|
189 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
190 | } else { |
204 | $::CONN->lookat ($x, $y) |
191 | $::CONN->lookat ($x, $y) |
205 | if $::CONN; |
192 | } |
|
|
193 | } |
206 | |
194 | |
207 | } elsif ($ev->{button} == 2) { |
195 | } elsif ($ev->{button} == 2) { |
208 | $self->grab_focus; |
196 | $self->grab_focus; |
209 | return unless $::CONN; |
197 | return unless $::CONN; |
210 | |
198 | |
… | |
… | |
236 | : "Enable automatic pickup", |
224 | : "Enable automatic pickup", |
237 | sub { $::PICKUP_ENABLE->toggle } |
225 | sub { $::PICKUP_ENABLE->toggle } |
238 | ], |
226 | ], |
239 | ); |
227 | ); |
240 | |
228 | |
241 | if ($::CONN && $::CONN->{editor_support} && 0) { |
229 | if ($::CONN && $::CONN->{editor_support}) { |
242 | push @items, [ |
230 | push @items, [ |
243 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
231 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
244 | \&editor_invoke, |
232 | \&editor_invoke, |
245 | ]; |
233 | ]; |
246 | |
234 | |
… | |
… | |
446 | } |
434 | } |
447 | |
435 | |
448 | sub set_magicmap { |
436 | sub set_magicmap { |
449 | my ($self, $w, $h, $x, $y, $data) = @_; |
437 | my ($self, $w, $h, $x, $y, $data) = @_; |
450 | |
438 | |
451 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
439 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
452 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
440 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
453 | |
441 | |
454 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
442 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
455 | |
443 | |
456 | $self->update; |
444 | $self->update; |
457 | } |
445 | } |
… | |
… | |
468 | unless $focused || !$::FAST; |
456 | unless $focused || !$::FAST; |
469 | |
457 | |
470 | if (delete $self->{need_update}) { |
458 | if (delete $self->{need_update}) { |
471 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
459 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
472 | |
460 | |
|
|
461 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
462 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
463 | |
473 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
464 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
474 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
465 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
475 | |
466 | |
476 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
467 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
477 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
468 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
478 | |
469 | |
479 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
470 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
480 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
471 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
481 | |
472 | |
482 | if ($::CFG->{fow_enable}) { |
473 | if ($::CFG->{fow_enable}) { |
483 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
474 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
484 | |
475 | |
485 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
476 | 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); |
477 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
487 | glConvolutionFilter2D ( |
478 | glConvolutionFilter2D ( |
488 | GL_CONVOLUTION_2D, |
479 | GL_CONVOLUTION_2D, |
… | |
… | |
510 | |
501 | |
511 | glPushMatrix; |
502 | glPushMatrix; |
512 | glTranslate $sx0, $sy0; |
503 | glTranslate $sx0, $sy0; |
513 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
504 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
514 | |
505 | |
515 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
506 | $::MAP->draw ($dx, $dy, $sw, $sh); |
516 | |
507 | |
517 | glScale 32, 32; |
508 | glScale 32, 32; |
518 | |
509 | |
519 | if (my $tex = $self->{fow_texture}) { |
510 | if (my $tex = $self->{fow_texture}) { |
520 | glEnable GL_TEXTURE_2D; |
511 | glEnable GL_TEXTURE_2D; |
… | |
… | |
527 | } |
518 | } |
528 | |
519 | |
529 | if ($self->{magicmap}) { |
520 | if ($self->{magicmap}) { |
530 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
521 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
531 | |
522 | |
532 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
523 | $x += $::MAP->ox + $self->{dx}; |
533 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
524 | $y += $::MAP->oy + $self->{dy}; |
534 | |
525 | |
535 | glTranslate - $x - 1, - $y - 1; |
526 | glTranslate - $x - 1, - $y - 1; |
536 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
527 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
537 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
528 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
538 | } |
529 | } |