… | |
… | |
184 | |
184 | |
185 | if ($ev->{button} == 1) { |
185 | if ($ev->{button} == 1) { |
186 | $self->grab_focus; |
186 | $self->grab_focus; |
187 | return unless $::CONN; |
187 | return unless $::CONN; |
188 | |
188 | |
189 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
189 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
190 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
190 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
191 | |
191 | |
192 | $x -= CFPlus::floor $::MAP->w * 0.5; |
192 | $x -= CFPlus::floor $::MAP->w * 0.5; |
193 | $y -= CFPlus::floor $::MAP->h * 0.5; |
193 | $y -= CFPlus::floor $::MAP->h * 0.5; |
194 | |
194 | |
195 | if ($::CONN) { |
195 | if ($::CONN) { |
… | |
… | |
349 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
349 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
350 | $::SETUP_DIALOG->toggle_visibility; |
350 | $::SETUP_DIALOG->toggle_visibility; |
351 | } elsif (!$::CONN) { |
351 | } elsif (!$::CONN) { |
352 | return 0; # bindings further down need a valid connection |
352 | return 0; # bindings further down need a valid connection |
353 | |
353 | |
354 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
354 | } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) { |
355 | $::CONN->user_send ("stay fire"); |
355 | $::CONN->user_send ("stay fire"); |
356 | } elsif ($uni == ord ",") { |
356 | } elsif ($uni == ord ",") { |
357 | $::CONN->user_send ("take"); |
357 | $::CONN->user_send ("take"); |
358 | } elsif ($uni == ord " ") { |
358 | } elsif ($uni == ord " ") { |
359 | $::CONN->user_send ("apply"); |
359 | $::CONN->user_send ("apply"); |
… | |
… | |
454 | |
454 | |
455 | return |
455 | return |
456 | unless $focused || !$::FAST; |
456 | unless $focused || !$::FAST; |
457 | |
457 | |
458 | if (delete $self->{need_update}) { |
458 | if (delete $self->{need_update}) { |
459 | my $tilesize = $self->{tilesize} = int $self->{tilesize} * $::CFG->{map_scale}; |
459 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
460 | |
460 | |
461 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
461 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
462 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
462 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
463 | |
463 | |
464 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
464 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
… | |
… | |
556 | |
556 | |
557 | $self->SUPER::DESTROY; |
557 | $self->SUPER::DESTROY; |
558 | } |
558 | } |
559 | |
559 | |
560 | package CFPlus::MapWidget::MapMap; |
560 | package CFPlus::MapWidget::MapMap; |
|
|
561 | |
|
|
562 | use strict; |
|
|
563 | use utf8; |
561 | |
564 | |
562 | our @ISA = CFPlus::UI::Base::; |
565 | our @ISA = CFPlus::UI::Base::; |
563 | |
566 | |
564 | use Time::HiRes qw(time); |
567 | use Time::HiRes qw(time); |
565 | use CFPlus::OpenGL; |
568 | use CFPlus::OpenGL; |