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.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 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
… …
67 ::stop_game (); 75 ::stop_game ();
68 local $::PROFILE->{host} = $server; 76 local $::PROFILE->{host} = $server;
69 ::start_game (); 77 ::start_game ();
70} 78}
71 79
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 80sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 81 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 82 or return;
84 83
85 my ($pid, $fh); 84 CFPlus::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 warn "FATAL: @_\n";
89 CFPlus::_exit 99;
90 };
91
92 open STDERR, ">&STDOUT";
93 binmode STDOUT, ":utf8";
94 binmode STDERR, ":utf8";
95 close $fh;
96
97 $| = 1;
98 print "preparing editor startup...\n"; 85 print "preparing editor startup...\n";
99 CFPlus::set_proxy;
100 86
101 my $server = $editsup->{gameserver} || "default"; 87 my $server = $editsup->{gameserver} || "default";
102 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 88 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103 89
104 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 90 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
105 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 91 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
106 92
107 print "map directory is $mapdir\n"; 93 print "map directory is $mapdir\n";
108 print "lib directory is $libdir\n"; 94 print "lib directory is $libdir\n";
109 95
110 require LWP::UserAgent; 96 my $ua = CFPlus::lwp_useragent;
111
112 my $ua = LWP::UserAgent->new (
113 agent => "cfplus $CFPlus::VERSION",
114 keep_alive => 1,
115 env_proxy => 1,
116 timeout => 30,
117 );
118 97
119 for my $file (qw(archetypes crossfire.0)) { 98 for my $file (qw(archetypes crossfire.0)) {
120 my $url = "$editsup->{lib_root}$file"; 99 my $url = "$editsup->{lib_root}$file";
121 print "mirroring $url...\n"; 100 print "mirroring $url...\n";
122 check_lwp $ua->mirror ($url, "$libdir/$file"); 101 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
123 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 102 printf "%s size %d octets\n", $file, -s "$libdir/$file";
124 } 103 }
125 104
126 if (1) { # upload a map 105 if (1) { # upload a map
127 my $mapname = $::CONN->{map_info}[0]; 106 my $mapname = $::CONN->{map_info}[0];
128 107
108 my $mappath = "$mapdir/$mapname";
109
110 -e $mappath and die "$mappath already exists\n";
111
129 print "getting map revision for $mapname...\n"; 112 print "getting map revision for $mapname...\n";
130 113
131 # try to get the most recent head revision, what a hack, 114 # try to get the most recent head revision, what a hack,
132 # this should have been returned while downloading *sigh* 115 # this should have been returned while downloading *sigh*
133 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$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;
134 117
135 if ($log =~ /\?rev=(\d+\.\d+)"/) { 118 if ($log =~ /\?rev=(\d+\.\d+)"/) {
136 my $rev = $1; 119 my $rev = $1;
137 120
138 print "downloading revision $rev...\n"; 121 print "downloading revision $rev...\n";
139 122
140 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 123 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
141 124
142 my $meta = { 125 my $meta = {
143 %$editsup, 126 %$editsup,
144 path => $mapname, 127 path => $mapname,
145 revision => $rev, 128 revision => $rev,
146 cf_login => $::PROFILE->{user}, 129 cf_login => $::PROFILE->{user},
147 }; 130 };
148 131
149 my $mappath = "$mapdir/$mapname";
150
151 require File::Basename; 132 require File::Basename;
152 require File::Path; 133 require File::Path;
153 134
154 File::Path::mkpath (File::Basename::dirname ($mappath)); 135 File::Path::mkpath (File::Basename::dirname ($mappath));
155 open my $fh, ">:raw:perlio", "$mappath.meta" 136 open my $fh, ">:raw:perlio", "$mappath.meta"
156 or die "$mappath.meta: $!"; 137 or die "$mappath.meta: $!\n";
157 print $fh CFPlus::to_json $meta; 138 print $fh CFPlus::to_json $meta;
158 close $fh; 139 close $fh;
159 open my $fh, ">:raw:perlio:utf8", $mappath 140 open my $fh, ">:raw:perlio:utf8", $mappath
160 or die "$mappath: $!"; 141 or die "$mappath: $!\n";
161 print $fh $map; 142 print $fh $map;
162 close $fh; 143 close $fh;
163 144
164 print "saved as $mappath\n"; 145 print "saved as $mappath\n";
165 146
… …
193# } 174# }
194 } else { 175 } else {
195 die "viewvc parse error, unable to detect revision\n"; 176 die "viewvc parse error, unable to detect revision\n";
196 } 177 }
197 } 178 }
198
199 CFPlus::_exit;
200 }
201
202 my $buffer;
203
204 Event->io (fd => $fh, poll => 'r', cb => sub {
205 unless (sysread $fh, $buffer, 4096, length $buffer) {
206 $_[0]->w->cancel;
207 $buffer .= "done\n";
208 }
209
210 while ($buffer =~ s/^(.*)\n//) {
211 ::message ({
212 markup => "editor($pid): " . CFPlus::asxml $1,
213 });
214 }
215 }); 179 }
216} 180}
217 181
218sub invoke_button_down { 182sub invoke_button_down {
219 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
220 184
221 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
222 $self->grab_focus; 186 $self->grab_focus;
223 return unless $::CONN; 187 return unless $::CONN;
224 188
225 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->{ctilesize};
226 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->{ctilesize};
227 191
228 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
229 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
230 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
231 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
232 if $::CONN; 200 }
201 }
233 202
234 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
235 $self->grab_focus; 204 $self->grab_focus;
236 return unless $::CONN; 205 return unless $::CONN;
237 206
… …
323 292
324 1 293 1
325} 294}
326 295
327sub size_request { 296sub size_request {
297 my ($self) = @_;
298
328 ( 299 (
329 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
330 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
331 ) 302 )
332} 303}
333 304
334sub update { 305sub update {
335 my ($self) = @_; 306 my ($self) = @_;
… …
337 $self->{need_update} = 1; 308 $self->{need_update} = 1;
338 $self->SUPER::update; 309 $self->SUPER::update;
339} 310}
340 311
341my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
342 CFPlus::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
343 CFPlus::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
344 CFPlus::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
345 CFPlus::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
346 CFPlus::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
… …
361 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
362 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
363 335
364 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
365 337
366 if ($uni == ord "\t") { 338 if ($sym == 9) {
367 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
368 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
369 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
370 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
371 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
372 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
375 ::toggle_player_page ($::SPELL_PAGE); 347 ::toggle_player_page ($::SPELL_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377 ::toggle_player_page ($::INVENTORY_PAGE); 349 ::toggle_player_page ($::INVENTORY_PAGE);
378 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379 $::SETUP_DIALOG->toggle_visibility; 351 $::SETUP_DIALOG->toggle_visibility;
380 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381 $::BIND_EDITOR->set_binding (undef, undef, [],
382 sub {
383 my ($mod, $sym, $cmds) = @_;
384 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385 });
386 $::BIND_EDITOR->start;
387 $::BIND_EDITOR->show;
388#TODO: elmex, what was this supposed to do? it currently crashes the client.
389# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390# $::BIND_EDITOR->stop;
391# $::BIND_EDITOR->ask_for_bind_and_commit;
392# $::BIND_EDITOR->hide;
393 } elsif (!$::CONN) { 352 } elsif (!$::CONN) {
394 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
395 354
396 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
397 $::CONN->user_send ("stay fire");
398 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
399 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
400 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
401 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
402 } elsif ($uni == 13) { 359 } elsif ($uni == 13) {
403 $::CONN->user_send ("examine"); 360 $::CONN->user_send ("examine");
404 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
405 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
406 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
407 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
408 $::CONN->user_send ($_) for @$bind_cmd; 365 $::CONN->macro_send ($_) for @macros;
409 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
410 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
411 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
412 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
413 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
414 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
415 $self->{completer}->show; 375 $self->{completer}->show;
416 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
417 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
… …
473} 433}
474 434
475sub set_magicmap { 435sub set_magicmap {
476 my ($self, $w, $h, $x, $y, $data) = @_; 436 my ($self, $w, $h, $x, $y, $data) = @_;
477 437
478 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
479 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
480 440
481 $self->{magicmap} = [$x, $y, $w, $h, $data]; 441 $self->{magicmap} = [$x, $y, $w, $h, $data];
482 442
483 $self->update; 443 $self->update;
484} 444}
… …
493 453
494 return 454 return
495 unless $focused || !$::FAST; 455 unless $focused || !$::FAST;
496 456
497 if (delete $self->{need_update}) { 457 if (delete $self->{need_update}) {
498 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
499 459
460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
462
500 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
501 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 464 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
502 465
503 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 466 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
504 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 467 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
505 468
506 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 469 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
507 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 470 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
508 471
509 if ($::CFG->{fow_enable}) { 472 if ($::CFG->{fow_enable}) {
510 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 473 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
511 474
512 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 475 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
513 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 476 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
514 glConvolutionFilter2D ( 477 glConvolutionFilter2D (
515 GL_CONVOLUTION_2D, 478 GL_CONVOLUTION_2D,
… …
537 500
538 glPushMatrix; 501 glPushMatrix;
539 glTranslate $sx0, $sy0; 502 glTranslate $sx0, $sy0;
540 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 503 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
541 504
542 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 505 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
543 506
544 glScale 32, 32; 507 glScale $self->{tilesize}, $self->{tilesize};
545 508
546 if (my $tex = $self->{fow_texture}) { 509 if (my $tex = $self->{fow_texture}) {
547 glEnable GL_TEXTURE_2D; 510 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
549 512
… …
554 } 517 }
555 518
556 if ($self->{magicmap}) { 519 if ($self->{magicmap}) {
557 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 520 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
558 521
559 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 522 $x += $::MAP->ox + $self->{dx};
560 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 523 $y += $::MAP->oy + $self->{dy};
561 524
562 glTranslate - $x - 1, - $y - 1; 525 glTranslate - $x - 1, - $y - 1;
563 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 526 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
564 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 527 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
565 } 528 }
… …
593 $self->SUPER::DESTROY; 556 $self->SUPER::DESTROY;
594} 557}
595 558
596package CFPlus::MapWidget::MapMap; 559package CFPlus::MapWidget::MapMap;
597 560
561use strict;
562use utf8;
563
598our @ISA = CFPlus::UI::Base::; 564our @ISA = CFPlus::UI::Base::;
599 565
600use Time::HiRes qw(time); 566use Time::HiRes qw(time);
601use CFPlus::OpenGL; 567use CFPlus::OpenGL;
602 568
… …
624 590
625 $::MAP or return; 591 $::MAP or return;
626 592
627 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
628 594
629 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 595 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
630 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
631 597
632 my $sx = int $::CFG->{map_shift_x} / 32; 598 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
633 my $sy = int $::CFG->{map_shift_y} / 32; 599 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
634 600
635 my $ox = 0.5 * ($w - $sw); 601 my $ox = 0.5 * ($w - $sw);
636 my $oy = 0.5 * ($h - $sh); 602 my $oy = 0.5 * ($h - $sh);
637 603
638 glEnable GL_BLEND; 604 glEnable GL_BLEND;
… …
711 677
712 if ($ev->{button} == 3) { 678 if ($ev->{button} == 3) {
713 (new CFPlus::UI::Menu 679 (new CFPlus::UI::Menu
714 items => [ 680 items => [
715 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 681 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
716 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 682 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
717 ], 683 ],
718 )->popup ($ev); 684 )->popup ($ev);
719 return 1; 685 return 1;
720 } 686 }
721 0 687 0

Diff Legend

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