… | |
… | |
59 | |
59 | |
60 | $self->{completer}->hide |
60 | $self->{completer}->hide |
61 | if $self->{completer}; |
61 | if $self->{completer}; |
62 | } |
62 | } |
63 | |
63 | |
64 | sub test_server_login { |
64 | sub server_login { |
65 | return unless |
65 | my ($server) = @_; |
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
66 | |
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
67 | ::stop_game (); |
70 | local $::PROFILE->{host} = $server; |
68 | local $::PROFILE->{host} = $server; |
71 | ::start_game (); |
69 | ::start_game (); |
72 | } |
70 | } |
73 | |
71 | |
74 | sub editor_invoke { |
72 | sub editor_invoke { |
75 | return unless $::CONN; |
73 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
74 | or return; |
76 | |
75 | |
77 | # putting the password into the env is somewhat tasteless |
76 | CFPlus::background { |
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
77 | 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 | |
78 | |
83 | # CFPlus::set_proxy; |
79 | my $server = $editsup->{gameserver} || "default"; |
|
|
80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
84 | |
81 | |
85 | # TODO: move into editor |
82 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
86 | require LWP::Simple; |
83 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
|
|
84 | |
|
|
85 | print "map directory is $mapdir\n"; |
|
|
86 | print "lib directory is $libdir\n"; |
|
|
87 | |
|
|
88 | my $ua = CFPlus::lwp_useragent; |
|
|
89 | |
|
|
90 | for my $file (qw(archetypes crossfire.0)) { |
|
|
91 | my $url = "$editsup->{lib_root}$file"; |
|
|
92 | print "mirroring $url...\n"; |
|
|
93 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
|
|
94 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
95 | } |
|
|
96 | |
|
|
97 | if (1) { # upload a map |
|
|
98 | my $mapname = $::CONN->{map_info}[0]; |
|
|
99 | |
|
|
100 | my $mappath = "$mapdir/$mapname"; |
|
|
101 | |
|
|
102 | -e $mappath and die "$mappath already exists\n"; |
|
|
103 | |
|
|
104 | print "getting map revision for $mapname...\n"; |
|
|
105 | |
|
|
106 | # try to get the most recent head revision, what a hack, |
|
|
107 | # this should have been returned while downloading *sigh* |
|
|
108 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
109 | |
|
|
110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
111 | my $rev = $1; |
|
|
112 | |
|
|
113 | print "downloading revision $rev...\n"; |
|
|
114 | |
|
|
115 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
116 | |
|
|
117 | my $meta = { |
|
|
118 | %$editsup, |
|
|
119 | path => $mapname, |
|
|
120 | revision => $rev, |
|
|
121 | cf_login => $::PROFILE->{user}, |
|
|
122 | }; |
|
|
123 | |
|
|
124 | require File::Basename; |
|
|
125 | require File::Path; |
|
|
126 | |
|
|
127 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
128 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
129 | or die "$mappath.meta: $!\n"; |
|
|
130 | print $fh CFPlus::to_json $meta; |
|
|
131 | close $fh; |
|
|
132 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
133 | or die "$mappath: $!\n"; |
|
|
134 | print $fh $map; |
|
|
135 | close $fh; |
|
|
136 | |
|
|
137 | print "saved as $mappath\n"; |
|
|
138 | |
|
|
139 | print "invoking editor...\n"; |
|
|
140 | exec "/root/s2/gce $mappath";#d# |
|
|
141 | |
|
|
142 | # now upload it |
|
|
143 | # require HTTP::Request::Common; |
|
|
144 | # |
|
|
145 | # my $res = $ua->post ( |
|
|
146 | # $ENV{CFPLUS_UPLOAD}, |
|
|
147 | # Content_Type => 'multipart/form-data', |
|
|
148 | # Content => [ |
|
|
149 | # path => $mapname, |
|
|
150 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
151 | # map => $map, |
|
|
152 | # revision => $rev, |
|
|
153 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
154 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
155 | # comment => "", |
|
|
156 | # ] |
|
|
157 | # ); |
|
|
158 | # |
|
|
159 | # if ($res->is_error) { |
|
|
160 | # # fatal condition |
|
|
161 | # warn $res->status_line; |
|
|
162 | # } else { |
|
|
163 | # # script replies are marked as {{..}} |
|
|
164 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
165 | # warn map "$_\n", @msgs; |
|
|
166 | # } |
|
|
167 | } else { |
|
|
168 | die "viewvc parse error, unable to detect revision\n"; |
|
|
169 | } |
|
|
170 | } |
|
|
171 | } |
87 | } |
172 | } |
88 | |
173 | |
89 | sub invoke_button_down { |
174 | sub invoke_button_down { |
90 | my ($self, $ev, $x, $y) = @_; |
175 | my ($self, $ev, $x, $y) = @_; |
91 | |
176 | |
92 | if ($ev->{button} == 1) { |
177 | if ($ev->{button} == 1) { |
93 | $self->grab_focus; |
178 | $self->grab_focus; |
94 | return unless $::CONN; |
179 | return unless $::CONN; |
95 | |
180 | |
96 | 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}; |
97 | 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}; |
98 | |
183 | |
99 | $x -= int 0.5 * $self->{sw}; |
184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
100 | $y -= int 0.5 * $self->{sh}; |
185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
101 | |
186 | |
|
|
187 | if ($::CONN) { |
|
|
188 | if ($::IN_BUILD_MODE) { |
|
|
189 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
190 | } else { |
102 | $::CONN->lookat ($x, $y) |
191 | $::CONN->lookat ($x, $y) |
103 | if $::CONN; |
192 | } |
|
|
193 | } |
104 | |
194 | |
105 | } elsif ($ev->{button} == 2) { |
195 | } elsif ($ev->{button} == 2) { |
106 | $self->grab_focus; |
196 | $self->grab_focus; |
107 | return unless $::CONN; |
197 | return unless $::CONN; |
108 | |
198 | |
… | |
… | |
118 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
208 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
119 | |
209 | |
120 | $self->update; |
210 | $self->update; |
121 | }; |
211 | }; |
122 | } elsif ($ev->{button} == 3) { |
212 | } elsif ($ev->{button} == 3) { |
123 | (new CFPlus::UI::Menu |
213 | my @items = ( |
124 | items => [ |
|
|
125 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
214 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
126 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
215 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
127 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
216 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
128 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
217 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
129 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
218 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
… | |
… | |
133 | $::PICKUP_ENABLE->{state} |
222 | $::PICKUP_ENABLE->{state} |
134 | ? "Disable automatic pickup" |
223 | ? "Disable automatic pickup" |
135 | : "Enable automatic pickup", |
224 | : "Enable automatic pickup", |
136 | sub { $::PICKUP_ENABLE->toggle } |
225 | sub { $::PICKUP_ENABLE->toggle } |
137 | ], |
226 | ], |
138 | $::CONN && length $::CONN->{cvs_root} |
227 | ); |
|
|
228 | |
|
|
229 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
230 | push @items, [ |
139 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] |
231 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
140 | : (), |
232 | \&editor_invoke, |
141 | $::CONN && length $::CONN->{test_server} |
233 | ]; |
142 | ? ["Login on Test Server", \&test_server_login] |
234 | |
143 | : (), |
235 | for my $type (qw(test name)) { |
|
|
236 | $::CONN->{editor_support}{type} ne $type |
|
|
237 | or next; |
|
|
238 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
239 | or next; |
|
|
240 | |
|
|
241 | push @items, [ |
|
|
242 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
243 | sub { server_login $server }, |
|
|
244 | ]; |
|
|
245 | } |
|
|
246 | } |
|
|
247 | |
|
|
248 | push @items, |
144 | ["Quit", |
249 | ["Quit", |
145 | sub { |
250 | sub { |
146 | if ($::CONN) { |
251 | if ($::CONN) { |
147 | &::open_quit_dialog; |
252 | &::open_quit_dialog; |
148 | } else { |
253 | } else { |
149 | exit; |
254 | exit; |
150 | } |
|
|
151 | } |
255 | } |
152 | ], |
256 | } |
153 | ], |
257 | ], |
|
|
258 | ; |
|
|
259 | |
|
|
260 | (new CFPlus::UI::Menu |
|
|
261 | items => \@items, |
154 | )->popup ($ev); |
262 | )->popup ($ev); |
155 | } |
263 | } |
156 | |
264 | |
157 | 1 |
265 | 1 |
158 | } |
266 | } |
… | |
… | |
326 | } |
434 | } |
327 | |
435 | |
328 | sub set_magicmap { |
436 | sub set_magicmap { |
329 | my ($self, $w, $h, $x, $y, $data) = @_; |
437 | my ($self, $w, $h, $x, $y, $data) = @_; |
330 | |
438 | |
331 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
439 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
332 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
440 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
333 | |
441 | |
334 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
442 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
335 | |
443 | |
336 | $self->update; |
444 | $self->update; |
337 | } |
445 | } |
… | |
… | |
348 | unless $focused || !$::FAST; |
456 | unless $focused || !$::FAST; |
349 | |
457 | |
350 | if (delete $self->{need_update}) { |
458 | if (delete $self->{need_update}) { |
351 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
459 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
352 | |
460 | |
|
|
461 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
462 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
463 | |
353 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
464 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
354 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
465 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
355 | |
466 | |
356 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
467 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
357 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
468 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
358 | |
469 | |
359 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
470 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
360 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
471 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
361 | |
472 | |
362 | if ($::CFG->{fow_enable}) { |
473 | if ($::CFG->{fow_enable}) { |
363 | 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); |
364 | |
475 | |
365 | 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 |
366 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
477 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
367 | glConvolutionFilter2D ( |
478 | glConvolutionFilter2D ( |
368 | GL_CONVOLUTION_2D, |
479 | GL_CONVOLUTION_2D, |
… | |
… | |
390 | |
501 | |
391 | glPushMatrix; |
502 | glPushMatrix; |
392 | glTranslate $sx0, $sy0; |
503 | glTranslate $sx0, $sy0; |
393 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
504 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
394 | |
505 | |
395 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
506 | $::MAP->draw ($dx, $dy, $sw, $sh); |
396 | |
507 | |
397 | glScale 32, 32; |
508 | glScale 32, 32; |
398 | |
509 | |
399 | if (my $tex = $self->{fow_texture}) { |
510 | if (my $tex = $self->{fow_texture}) { |
400 | glEnable GL_TEXTURE_2D; |
511 | glEnable GL_TEXTURE_2D; |
… | |
… | |
407 | } |
518 | } |
408 | |
519 | |
409 | if ($self->{magicmap}) { |
520 | if ($self->{magicmap}) { |
410 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
521 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
411 | |
522 | |
412 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
523 | $x += $::MAP->ox + $self->{dx}; |
413 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
524 | $y += $::MAP->oy + $self->{dy}; |
414 | |
525 | |
415 | glTranslate - $x - 1, - $y - 1; |
526 | glTranslate - $x - 1, - $y - 1; |
416 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
527 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
417 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
528 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
418 | } |
529 | } |
… | |
… | |
775 | |
886 | |
776 | $self->SUPER::_draw; |
887 | $self->SUPER::_draw; |
777 | } |
888 | } |
778 | |
889 | |
779 | 1 |
890 | 1 |
|
|
891 | |