… | |
… | |
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() { 64 } |
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) { |
… | |
… | |
337 | ::toggle_player_page ($::SPELL_PAGE); |
339 | ::toggle_player_page ($::SPELL_PAGE); |
338 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
339 | ::toggle_player_page ($::INVENTORY_PAGE); |
341 | ::toggle_player_page ($::INVENTORY_PAGE); |
340 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
342 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
341 | $::SETUP_DIALOG->toggle_visibility; |
343 | $::SETUP_DIALOG->toggle_visibility; |
342 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
343 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
344 | sub { |
|
|
345 | my ($mod, $sym, $cmds) = @_; |
|
|
346 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
347 | }); |
|
|
348 | $::BIND_EDITOR->start; |
|
|
349 | $::BIND_EDITOR->show; |
|
|
350 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
351 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
352 | # $::BIND_EDITOR->stop; |
|
|
353 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
354 | # $::BIND_EDITOR->hide; |
|
|
355 | } elsif (!$::CONN) { |
344 | } elsif (!$::CONN) { |
356 | return 0; # bindings further down need a valid connection |
345 | return 0; # bindings further down need a valid connection |
357 | |
346 | |
358 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
347 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
359 | $::CONN->user_send ("stay fire"); |
348 | $::CONN->user_send ("stay fire"); |
… | |
… | |
364 | } elsif ($uni == 13) { |
353 | } elsif ($uni == 13) { |
365 | $::CONN->user_send ("examine"); |
354 | $::CONN->user_send ("examine"); |
366 | } elsif ($uni == ord ".") { |
355 | } elsif ($uni == ord ".") { |
367 | $::CONN->user_send ($self->{completer}{last_command}) |
356 | $::CONN->user_send ($self->{completer}{last_command}) |
368 | if exists $self->{completer}{last_command}; |
357 | if exists $self->{completer}{last_command}; |
369 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
358 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
370 | $::CONN->user_send ($_) for @$bind_cmd; |
359 | $::CONN->macro_send ($_) for @macros; |
371 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
372 | $::CONN->user_send ("rotateshoottype +"); |
361 | $::CONN->user_send ("rotateshoottype +"); |
373 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
374 | $::CONN->user_send ("rotateshoottype -"); |
363 | $::CONN->user_send ("rotateshoottype -"); |
|
|
364 | } elsif ($uni == ord '!') { |
|
|
365 | $self->{completer}->set_prefix ("shout "); |
|
|
366 | $self->{completer}->show; |
375 | } elsif ($uni == ord '"') { |
367 | } elsif ($uni == ord '"') { |
376 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
368 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
377 | $self->{completer}->show; |
369 | $self->{completer}->show; |
378 | } elsif ($uni == ord "'") { |
370 | } elsif ($uni == ord "'") { |
379 | $self->{completer}->set_prefix (""); |
371 | $self->{completer}->set_prefix (""); |
… | |
… | |
455 | |
447 | |
456 | return |
448 | return |
457 | unless $focused || !$::FAST; |
449 | unless $focused || !$::FAST; |
458 | |
450 | |
459 | if (delete $self->{need_update}) { |
451 | if (delete $self->{need_update}) { |
460 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
452 | my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale}; |
461 | |
453 | |
462 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
454 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
463 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
455 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
464 | |
456 | |
465 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
457 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
… | |
… | |
502 | |
494 | |
503 | glPushMatrix; |
495 | glPushMatrix; |
504 | glTranslate $sx0, $sy0; |
496 | glTranslate $sx0, $sy0; |
505 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
506 | |
498 | |
507 | $::MAP->draw ($dx, $dy, $sw, $sh); |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, ::T); |
508 | |
500 | |
509 | glScale 32, 32; |
501 | glScale ::T, ::T; |
510 | |
502 | |
511 | if (my $tex = $self->{fow_texture}) { |
503 | if (my $tex = $self->{fow_texture}) { |
512 | glEnable GL_TEXTURE_2D; |
504 | glEnable GL_TEXTURE_2D; |
513 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
505 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
514 | |
506 | |
… | |
… | |
589 | |
581 | |
590 | $::MAP or return; |
582 | $::MAP or return; |
591 | |
583 | |
592 | my ($w, $h) = @$self{qw(w h)}; |
584 | my ($w, $h) = @$self{qw(w h)}; |
593 | |
585 | |
594 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
586 | my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; |
595 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
587 | my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; |
596 | |
588 | |
597 | my $sx = int $::CFG->{map_shift_x} / 32; |
589 | my $sx = int $::CFG->{map_shift_x} / ::T; |
598 | my $sy = int $::CFG->{map_shift_y} / 32; |
590 | my $sy = int $::CFG->{map_shift_y} / ::T; |
599 | |
591 | |
600 | my $ox = 0.5 * ($w - $sw); |
592 | my $ox = 0.5 * ($w - $sw); |
601 | my $oy = 0.5 * ($h - $sh); |
593 | my $oy = 0.5 * ($h - $sh); |
602 | |
594 | |
603 | glEnable GL_BLEND; |
595 | glEnable GL_BLEND; |