ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC

… …
32 @_ 32 @_
33 ); 33 );
34 34
35 $self->{completer} = new CFPlus::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 36 command => $self->{command},
37 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "#completer_help",
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45 ; 38 ;
46 39
47 $self 40 $self
48} 41}
49 42
… …
66 59
67 $self->{completer}->hide 60 $self->{completer}->hide
68 if $self->{completer}; 61 if $self->{completer};
69} 62}
70 63
64sub server_login {
65 my ($server) = @_;
66
67 ::stop_game ();
68 local $::PROFILE->{host} = $server;
69 ::start_game ();
70}
71
72sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return;
75
76 CFPlus::background {
77 print "preparing editor startup...\n";
78
79 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81
82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
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 }
172}
173
71sub invoke_button_down { 174sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
73 176
74 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
75 $self->grab_focus; 178 $self->grab_focus;
76 return unless $::CONN; 179 return unless $::CONN;
77 180
78 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};
79 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};
80 183
81 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
82 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
83 186
187 if ($::CONN) {
188 if ($::IN_BUILD_MODE) {
189 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190 } else {
84 $::CONN->lookat ($x, $y) 191 $::CONN->lookat ($x, $y)
85 if $::CONN; 192 }
193 }
86 194
87 } elsif ($ev->{button} == 2) { 195 } elsif ($ev->{button} == 2) {
88 $self->grab_focus; 196 $self->grab_focus;
89 return unless $::CONN; 197 return unless $::CONN;
90 198
… …
100 $::CFG->{map_shift_y} = $bh + $y - $oy; 208 $::CFG->{map_shift_y} = $bh + $y - $oy;
101 209
102 $self->update; 210 $self->update;
103 }; 211 };
104 } elsif ($ev->{button} == 3) { 212 } elsif ($ev->{button} == 3) {
105 (new CFPlus::UI::Menu 213 my @items = (
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 214 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 215 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 216 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 217 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 218 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
115 $::PICKUP_ENABLE->{state} 222 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup" 223 ? "Disable automatic pickup"
117 : "Enable automatic pickup", 224 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle } 225 sub { $::PICKUP_ENABLE->toggle }
119 ], 226 ],
227 );
228
229 if ($::CONN && $::CONN->{editor_support}) {
230 push @items, [
231 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
232 \&editor_invoke,
233 ];
234
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,
120 ["Quit", 249 ["Quit",
121 sub { 250 sub {
122 if ($::CONN) { 251 if ($::CONN) {
123 &::open_quit_dialog; 252 &::open_quit_dialog;
124 } else { 253 } else {
125 exit; 254 exit;
126 }
127 } 255 }
128 ], 256 }
129 ], 257 ],
258 ;
259
260 (new CFPlus::UI::Menu
261 items => \@items,
130 )->popup ($ev); 262 )->popup ($ev);
131 } 263 }
132 264
133 1 265 1
134} 266}
… …
212 my ($mod, $sym, $cmds) = @_; 344 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 345 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 }); 346 });
215 $::BIND_EDITOR->start; 347 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show; 348 $::BIND_EDITOR->show;
349#TODO: elmex, what was this supposed to do? it currently crashes the client.
217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { 350# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop; 351# $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit; 352# $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide; 353# $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) { 354 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection 355 return 0; # bindings further down need a valid connection
223 356
224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 357 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225 $::CONN->user_send ("stay fire"); 358 $::CONN->user_send ("stay fire");
226 } elsif ($uni == ord ",") { 359 } elsif ($uni == ord ",") {
227 $::CONN->user_send ("take"); 360 $::CONN->user_send ("take");
228 } elsif ($uni == ord " ") { 361 } elsif ($uni == ord " ") {
229 $::CONN->user_send ("apply"); 362 $::CONN->user_send ("apply");
363 } elsif ($uni == 13) {
364 $::CONN->user_send ("examine");
230 } elsif ($uni == ord ".") { 365 } elsif ($uni == ord ".") {
231 $::CONN->user_send ($self->{completer}{last_command}) 366 $::CONN->user_send ($self->{completer}{last_command})
232 if exists $self->{completer}{last_command}; 367 if exists $self->{completer}{last_command};
233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 368 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
234 $::CONN->user_send ($_) for @$bind_cmd; 369 $::CONN->user_send ($_) for @$bind_cmd;
235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 370 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
236 $::CONN->user_send ("rotateshoottype +"); 371 $::CONN->user_send ("rotateshoottype +");
237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 372 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
238 $::CONN->user_send ("rotateshoottype -"); 373 $::CONN->user_send ("rotateshoottype -");
… …
299} 434}
300 435
301sub set_magicmap { 436sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
303 438
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306 441
307 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
308 443
309 $self->update; 444 $self->update;
310} 445}
… …
321 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
322 457
323 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325 460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
326 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328 466
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331 469
332 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
333 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
334 472
335 if ($::CFG->{fow_enable}) { 473 if ($::CFG->{fow_enable}) {
336 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);
337 475
338 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
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D ( 478 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D, 479 GL_CONVOLUTION_2D,
… …
363 501
364 glPushMatrix; 502 glPushMatrix;
365 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
366 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367 505
368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh);
369 507
370 glScale 32, 32; 508 glScale 32, 32;
371 509
372 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
373 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
… …
380 } 518 }
381 519
382 if ($self->{magicmap}) { 520 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384 522
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 523 $x += $::MAP->ox + $self->{dx};
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 524 $y += $::MAP->oy + $self->{dy};
387 525
388 glTranslate - $x - 1, - $y - 1; 526 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 } 529 }
… …
748 886
749 $self->SUPER::_draw; 887 $self->SUPER::_draw;
750} 888}
751 889
7521 8901
891

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines