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.84 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.104 by root, Wed Apr 4 02:43:29 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
25 27
26 smooth_matrix => [ 28 smooth_matrix => [
27 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
38 ; 40 ;
39 41
40 $self 42 $self
41} 43}
42 44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
49}
50
43sub add_command { 51sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 53
46 (my $data = $command) =~ s/\\//g; 54 (my $data = $command) =~ s/\\//g;
47 55
… …
59 67
60 $self->{completer}->hide 68 $self->{completer}->hide
61 if $self->{completer}; 69 if $self->{completer};
62} 70}
63 71
64sub test_server_login { 72sub server_login {
65 return unless 73 my ($server) = @_;
66 $::CONN && length $::CONN->{test_server};
67 74
68 my $server = $::CONN->{test_server};
69 ::stop_game (); 75 ::stop_game ();
70 local $::PROFILE->{host} = $server; 76 local $::PROFILE->{host} = $server;
71 ::start_game (); 77 ::start_game ();
72} 78}
73 79
74sub editor_invoke { 80sub editor_invoke {
75 return unless $::CONN; 81 my $editsup = $::CONN && $::CONN->{editor_support}
82 or return;
76 83
77 # putting the password into the env is somewhat tasteless 84 CFPlus::background {
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; 85 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 86
83 CFPlus::set_proxy; 87 my $server = $editsup->{gameserver} || "default";
88 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 89
85 my $map = "map:$::CONN->{map_info}[0]"; 90 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
91 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
86 92
87 if (fork == 0) { 93 print "map directory is $mapdir\n";
88 $SIG{__DIE__} = sub { 94 print "lib directory is $libdir\n";
89 warn "@_"; 95
90 CFPlus::_exit 99; 96 my $ua = CFPlus::lwp_useragent;
97
98 for my $file (qw(archetypes crossfire.0)) {
99 my $url = "$editsup->{lib_root}$file";
100 print "mirroring $url...\n";
101 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
102 printf "%s size %d octets\n", $file, -s "$libdir/$file";
91 }; 103 }
92 104
93 # TODO: move into editor 105 if (1) { # upload a map
94 require LWP::UserAgent; 106 my $mapname = $::CONN->{map_info}[0];
95 107
96 my $ua = LWP::UserAgent->new ( 108 my $mappath = "$mapdir/$mapname";
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101 109
102 if ($map =~ /^map:(.*)/) { 110 -e $mappath and die "$mappath already exists\n";
103 my $mapname = $1; 111
112 print "getting map revision for $mapname...\n";
113
104 # try to get the most recent head revision, what a hack 114 # try to get the most recent head revision, what a hack,
115 # this should have been returned while downloading *sigh*
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; 116 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
106 117
107 if ($log =~ /\?rev=(\d+\.\d+)"/) { 118 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1; 119 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; 120
110 warn "revision is $rev " .(length $map)."\n";#d# 121 print "downloading revision $rev...\n";
122
123 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
124
125 my $meta = {
126 %$editsup,
127 path => $mapname,
128 revision => $rev,
129 cf_login => $::PROFILE->{user},
130 };
131
132 require File::Basename;
133 require File::Path;
134
135 File::Path::mkpath (File::Basename::dirname ($mappath));
136 open my $fh, ">:raw:perlio", "$mappath.meta"
137 or die "$mappath.meta: $!\n";
138 print $fh CFPlus::to_json $meta;
139 close $fh;
140 open my $fh, ">:raw:perlio:utf8", $mappath
141 or die "$mappath: $!\n";
142 print $fh $map;
143 close $fh;
144
145 print "saved as $mappath\n";
146
147 print "invoking editor...\n";
148 exec "/root/s2/gce $mappath";#d#
111 149
112 # now upload it 150 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common; 151# require HTTP::Request::Common;
116 152#
117 my $res = $ua->post ( 153# my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD}, 154# $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data', 155# Content_Type => 'multipart/form-data',
120 Content => [ 156# Content => [
121 path => $mapname, 157# path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR}, 158# mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map, 159# map => $map,
124 revision => $rev, 160# revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN}, 161# cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD}, 162# cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "", 163# comment => "",
128 ] 164# ]
129 ); 165# );
130 166#
131 if ($res->is_error) { 167# if ($res->is_error) {
132 # fatal condition 168# # fatal condition
133 warn $res->status_line; 169# warn $res->status_line;
134 } else { 170# } else {
135 # script replies are marked as {{..}} 171# # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; 172# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs; 173# warn map "$_\n", @msgs;
138 } 174# }
139 } else { 175 } else {
140 # error, could not detect revision 176 die "viewvc parse error, unable to detect revision\n";
141 } 177 }
142 } 178 }
143
144 CFPlus::_exit;
145 } 179 }
146} 180}
147 181
148sub invoke_button_down { 182sub invoke_button_down {
149 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
150 184
151 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
152 $self->grab_focus; 186 $self->grab_focus;
153 return unless $::CONN; 187 return unless $::CONN;
154 188
155 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
156 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
157 191
158 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
159 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
160 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
161 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
162 if $::CONN; 200 }
201 }
163 202
164 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
165 $self->grab_focus; 204 $self->grab_focus;
166 return unless $::CONN; 205 return unless $::CONN;
167 206
… …
177 $::CFG->{map_shift_y} = $bh + $y - $oy; 216 $::CFG->{map_shift_y} = $bh + $y - $oy;
178 217
179 $self->update; 218 $self->update;
180 }; 219 };
181 } elsif ($ev->{button} == 3) { 220 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu 221 my @items = (
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 222 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 223 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 224 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 225 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 226 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
192 $::PICKUP_ENABLE->{state} 230 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup" 231 ? "Disable automatic pickup"
194 : "Enable automatic pickup", 232 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle } 233 sub { $::PICKUP_ENABLE->toggle }
196 ], 234 ],
197 $::CONN && length $::CONN->{cvs_root} 235 );
236
237 if ($::CONN && $::CONN->{editor_support}) {
238 push @items, [
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 239 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke] 240 \&editor_invoke,
200 : (), 241 ];
201 $::CONN && length $::CONN->{test_server} 242
243 for my $type (qw(test name)) {
244 $::CONN->{editor_support}{type} ne $type
245 or next;
246 my $server = $::CONN->{editor_support}{"${type}server"}
247 or next;
248
249 push @items, [
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", 250 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
203 \&test_server_login] 251 sub { server_login $server },
204 : (), 252 ];
253 }
254 }
255
256 push @items,
205 ["Quit", 257 ["Quit",
206 sub { 258 sub {
207 if ($::CONN) { 259 if ($::CONN) {
208 &::open_quit_dialog; 260 &::open_quit_dialog;
209 } else { 261 } else {
210 exit; 262 exit;
211 }
212 } 263 }
213 ], 264 }
214 ], 265 ],
266 ;
267
268 (new CFPlus::UI::Menu
269 items => \@items,
215 )->popup ($ev); 270 )->popup ($ev);
216 } 271 }
217 272
218 1 273 1
219} 274}
… …
237 292
238 1 293 1
239} 294}
240 295
241sub size_request { 296sub size_request {
297 my ($self) = @_;
298
242 ( 299 (
243 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
244 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
245 ) 302 )
246} 303}
247 304
248sub update { 305sub update {
249 my ($self) = @_; 306 my ($self) = @_;
… …
275 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
276 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
277 334
278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279 336
280 if ($uni == ord "\t") { 337 if ($sym == 9) {
281 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
289 ::toggle_player_page ($::SPELL_PAGE); 346 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE); 348 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::SETUP_DIALOG->toggle_visibility; 350 $::SETUP_DIALOG->toggle_visibility;
294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
295 $::BIND_EDITOR->set_binding (undef, undef, [],
296 sub {
297 my ($mod, $sym, $cmds) = @_;
298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
299 });
300 $::BIND_EDITOR->start;
301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
304# $::BIND_EDITOR->stop;
305# $::BIND_EDITOR->ask_for_bind_and_commit;
306# $::BIND_EDITOR->hide;
307 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
308 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
309 353
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
311 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
… …
316 } elsif ($uni == 13) { 360 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine"); 361 $::CONN->user_send ("examine");
318 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
319 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
320 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
322 $::CONN->user_send ($_) for @$bind_cmd; 366 $::CONN->macro_send ($_) for @macros;
323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
324 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
326 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
327 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
328 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
329 $self->{completer}->show; 376 $self->{completer}->show;
330 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
331 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
387} 434}
388 435
389sub set_magicmap { 436sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
391 438
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394 441
395 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
396 443
397 $self->update; 444 $self->update;
398} 445}
… …
407 454
408 return 455 return
409 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
410 457
411 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{tilesize} = int $self->{tilesize} * $::CFG->{map_scale};
413 460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
416 466
417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
419 469
420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
422 472
423 if ($::CFG->{fow_enable}) { 473 if ($::CFG->{fow_enable}) {
424 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);
425 475
426 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
427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
428 glConvolutionFilter2D ( 478 glConvolutionFilter2D (
429 GL_CONVOLUTION_2D, 479 GL_CONVOLUTION_2D,
… …
451 501
452 glPushMatrix; 502 glPushMatrix;
453 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
454 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
455 505
456 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
457 507
458 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
459 509
460 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
461 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
463 513
… …
468 } 518 }
469 519
470 if ($self->{magicmap}) { 520 if ($self->{magicmap}) {
471 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472 522
473 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 523 $x += $::MAP->ox + $self->{dx};
474 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 524 $y += $::MAP->oy + $self->{dy};
475 525
476 glTranslate - $x - 1, - $y - 1; 526 glTranslate - $x - 1, - $y - 1;
477 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479 } 529 }
… …
538 588
539 $::MAP or return; 589 $::MAP or return;
540 590
541 my ($w, $h) = @$self{qw(w h)}; 591 my ($w, $h) = @$self{qw(w h)};
542 592
543 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 593 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
544 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 594 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
545 595
546 my $sx = int $::CFG->{map_shift_x} / 32; 596 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
547 my $sy = int $::CFG->{map_shift_y} / 32; 597 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
548 598
549 my $ox = 0.5 * ($w - $sw); 599 my $ox = 0.5 * ($w - $sw);
550 my $oy = 0.5 * ($h - $sh); 600 my $oy = 0.5 * ($h - $sh);
551 601
552 glEnable GL_BLEND; 602 glEnable GL_BLEND;
… …
625 675
626 if ($ev->{button} == 3) { 676 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu 677 (new CFPlus::UI::Menu
628 items => [ 678 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 680 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631 ], 681 ],
632 )->popup ($ev); 682 )->popup ($ev);
633 return 1; 683 return 1;
634 } 684 }
635 0 685 0
… …
836 886
837 $self->SUPER::_draw; 887 $self->SUPER::_draw;
838} 888}
839 889
8401 8901
891

Diff Legend

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