… | |
… | |
9 | use CFPlus::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
11 | use CFPlus::Macro; |
11 | use CFPlus::Macro; |
12 | |
12 | |
13 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = CFPlus::UI::Base::; |
|
|
14 | |
|
|
15 | sub ::T() { 32 } |
14 | |
16 | |
15 | my $magicmap_tex = |
17 | my $magicmap_tex = |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
18 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
19 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
20 | |
… | |
… | |
286 | 1 |
288 | 1 |
287 | } |
289 | } |
288 | |
290 | |
289 | sub size_request { |
291 | sub size_request { |
290 | ( |
292 | ( |
291 | 32 * CFPlus::ceil $::WIDTH / 32, |
293 | ::T * CFPlus::ceil $::WIDTH / ::T, |
292 | 32 * CFPlus::ceil $::HEIGHT / 32, |
294 | ::T * CFPlus::ceil $::HEIGHT / ::T, |
293 | ) |
295 | ) |
294 | } |
296 | } |
295 | |
297 | |
296 | sub update { |
298 | sub update { |
297 | my ($self) = @_; |
299 | my ($self) = @_; |
… | |
… | |
323 | my $sym = $ev->{sym}; |
325 | my $sym = $ev->{sym}; |
324 | my $uni = $ev->{unicode}; |
326 | my $uni = $ev->{unicode}; |
325 | |
327 | |
326 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
328 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
327 | |
329 | |
328 | if ($uni == ord "\t") { |
330 | if ($sym == 9) { |
329 | $::PL_WINDOW->toggle_visibility; |
331 | ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; |
330 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
332 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
331 | $::HELP_WINDOW->toggle_visibility; |
333 | $::HELP_WINDOW->toggle_visibility; |
332 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
334 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
333 | ::toggle_player_page ($::STATS_PAGE); |
335 | ::toggle_player_page ($::STATS_PAGE); |
334 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
336 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
… | |
… | |
352 | $::CONN->user_send ("examine"); |
354 | $::CONN->user_send ("examine"); |
353 | } elsif ($uni == ord ".") { |
355 | } elsif ($uni == ord ".") { |
354 | $::CONN->user_send ($self->{completer}{last_command}) |
356 | $::CONN->user_send ($self->{completer}{last_command}) |
355 | if exists $self->{completer}{last_command}; |
357 | if exists $self->{completer}{last_command}; |
356 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
358 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
357 | warn "<@macros>\n";#d# |
|
|
358 | $::CONN->macro_send ($_) for @macros; |
359 | $::CONN->macro_send ($_) for @macros; |
359 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | $::CONN->user_send ("rotateshoottype +"); |
361 | $::CONN->user_send ("rotateshoottype +"); |
361 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | $::CONN->user_send ("rotateshoottype -"); |
363 | $::CONN->user_send ("rotateshoottype -"); |
|
|
364 | } elsif ($uni == ord '!') { |
|
|
365 | $self->{completer}->set_prefix ("shout "); |
|
|
366 | $self->{completer}->show; |
363 | } elsif ($uni == ord '"') { |
367 | } elsif ($uni == ord '"') { |
364 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
368 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
365 | $self->{completer}->show; |
369 | $self->{completer}->show; |
366 | } elsif ($uni == ord "'") { |
370 | } elsif ($uni == ord "'") { |
367 | $self->{completer}->set_prefix (""); |
371 | $self->{completer}->set_prefix (""); |
… | |
… | |
443 | |
447 | |
444 | return |
448 | return |
445 | unless $focused || !$::FAST; |
449 | unless $focused || !$::FAST; |
446 | |
450 | |
447 | if (delete $self->{need_update}) { |
451 | if (delete $self->{need_update}) { |
448 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
452 | my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale}; |
449 | |
453 | |
450 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
454 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
451 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
455 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
452 | |
456 | |
453 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
457 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
… | |
… | |
490 | |
494 | |
491 | glPushMatrix; |
495 | glPushMatrix; |
492 | glTranslate $sx0, $sy0; |
496 | glTranslate $sx0, $sy0; |
493 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
494 | |
498 | |
495 | $::MAP->draw ($dx, $dy, $sw, $sh); |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, ::T); |
496 | |
500 | |
497 | glScale 32, 32; |
501 | glScale ::T, ::T; |
498 | |
502 | |
499 | if (my $tex = $self->{fow_texture}) { |
503 | if (my $tex = $self->{fow_texture}) { |
500 | glEnable GL_TEXTURE_2D; |
504 | glEnable GL_TEXTURE_2D; |
501 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
505 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
502 | |
506 | |
… | |
… | |
577 | |
581 | |
578 | $::MAP or return; |
582 | $::MAP or return; |
579 | |
583 | |
580 | my ($w, $h) = @$self{qw(w h)}; |
584 | my ($w, $h) = @$self{qw(w h)}; |
581 | |
585 | |
582 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
586 | my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; |
583 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
587 | my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; |
584 | |
588 | |
585 | my $sx = int $::CFG->{map_shift_x} / 32; |
589 | my $sx = int $::CFG->{map_shift_x} / ::T; |
586 | my $sy = int $::CFG->{map_shift_y} / 32; |
590 | my $sy = int $::CFG->{map_shift_y} / ::T; |
587 | |
591 | |
588 | my $ox = 0.5 * ($w - $sw); |
592 | my $ox = 0.5 * ($w - $sw); |
589 | my $oy = 0.5 * ($h - $sh); |
593 | my $oy = 0.5 * ($h - $sh); |
590 | |
594 | |
591 | glEnable GL_BLEND; |
595 | glEnable GL_BLEND; |