ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.84 by elmex, Wed May 31 12:44:17 2006 UTC vs.
Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC

… …
276 } 276 }
277 277
278 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 278 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
279 $::CONN->send ("move $targ $self->{tag} 0") 279 $::CONN->send ("move $targ $self->{tag} 0")
280 if $targ || !($self->{flags} & F_LOCKED); 280 if $targ || !($self->{flags} & F_LOCKED);
281 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
282 $self->{flags} & F_LOCKED
283 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
284 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
281 } elsif ($ev->{button} == 1) { 285 } elsif ($ev->{button} == 1) {
282 $::CONN->send ("examine $self->{tag}"); 286 $::CONN->send ("examine $self->{tag}");
283 } elsif ($ev->{button} == 2) { 287 } elsif ($ev->{button} == 2) {
284 $::CONN->send ("apply $self->{tag}"); 288 $::CONN->send ("apply $self->{tag}");
285 } elsif ($ev->{button} == 3) { 289 } elsif ($ev->{button} == 3) {
… …
312 316
313 my $tooltip_std = "<small>" 317 my $tooltip_std = "<small>"
314 . "Left click - examine item\n" 318 . "Left click - examine item\n"
315 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 319 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
316 . "Middle click - apply\n" 320 . "Middle click - apply\n"
321 . "Shift-Middle click - lock/unlock\n"
317 . "Right click - further options" 322 . "Right click - further options"
318 . "</small>\n"; 323 . "</small>\n";
319 324
320 $self->{face_widget} ||= new CFClient::UI::Face 325 $self->{face_widget} ||= new CFClient::UI::Face
321 can_events => 1, 326 can_events => 1,
… …
363} 368}
364 369
365package CFClient::Binder; 370package CFClient::Binder;
366 371
367my @ALLOWED_MODIFIER_KEYS = ( 372my @ALLOWED_MODIFIER_KEYS = (
368 (CFClient::SDLK_LSHIFT), 373 CFClient::SDLK_LSHIFT,
369 (CFClient::SDLK_LCTRL ), 374 CFClient::SDLK_LCTRL ,
370 (CFClient::SDLK_LALT ), 375 CFClient::SDLK_LALT ,
371 (CFClient::SDLK_LMETA ), 376 CFClient::SDLK_LMETA ,
372 377
373 (CFClient::SDLK_RSHIFT), 378 CFClient::SDLK_RSHIFT,
374 (CFClient::SDLK_RCTRL ), 379 CFClient::SDLK_RCTRL ,
375 (CFClient::SDLK_RALT ), 380 CFClient::SDLK_RALT ,
376 (CFClient::SDLK_RMETA ), 381 CFClient::SDLK_RMETA ,
377); 382);
378 383
379my %ALLOWED_MODIFIERS = ( 384my %ALLOWED_MODIFIERS = (
380 (CFClient::KMOD_LSHIFT) => "LSHIFT", 385 CFClient::KMOD_LSHIFT => "LSHIFT",
381 (CFClient::KMOD_LCTRL ) => "LCTRL", 386 CFClient::KMOD_LCTRL => "LCTRL",
382 (CFClient::KMOD_LALT ) => "LALT", 387 CFClient::KMOD_LALT => "LALT",
383 (CFClient::KMOD_LMETA ) => "LMETA", 388 CFClient::KMOD_LMETA => "LMETA",
384 389
385 (CFClient::KMOD_RSHIFT) => "RSHIFT", 390 CFClient::KMOD_RSHIFT => "RSHIFT",
386 (CFClient::KMOD_RCTRL ) => "RCTRL", 391 CFClient::KMOD_RCTRL => "RCTRL",
387 (CFClient::KMOD_RALT ) => "RALT", 392 CFClient::KMOD_RALT => "RALT",
388 (CFClient::KMOD_RMETA ) => "RMETA", 393 CFClient::KMOD_RMETA => "RMETA",
389); 394);
390 395
391my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; 396my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
392my @DIRECT_BIND_KEYS = ( 397my @DIRECT_BIND_KEYS = (
393 CFClient::SDLK_F1, 398 CFClient::SDLK_F1,
… …
467 $mods .= "+" if $mods ne ''; 472 $mods .= "+" if $mods ne '';
468 473
469 return $mods . CFClient::SDL_GetKeyName ($sym); 474 return $mods . CFClient::SDL_GetKeyName ($sym);
470} 475}
471 476
477package CFClient::Pickup;
478# some pickup constants
479sub PU_NOTHING { 0x00000000 }
480
481sub PU_DEBUG { 0x10000000 }
482sub PU_INHIBIT { 0x20000000 }
483sub PU_STOP { 0x40000000 }
484sub PU_NEWMODE { 0x80000000 }
485
486sub PU_RATIO { 0x0000000F }
487
488sub PU_FOOD { 0x00000010 }
489sub PU_DRINK { 0x00000020 }
490sub PU_VALUABLES { 0x00000040 }
491sub PU_BOW { 0x00000080 }
492
493sub PU_ARROW { 0x00000100 }
494sub PU_HELMET { 0x00000200 }
495sub PU_SHIELD { 0x00000400 }
496sub PU_ARMOUR { 0x00000800 }
497
498sub PU_BOOTS { 0x00001000 }
499sub PU_GLOVES { 0x00002000 }
500sub PU_CLOAK { 0x00004000 }
501sub PU_KEY { 0x00008000 }
502
503sub PU_MISSILEWEAPON { 0x00010000 }
504sub PU_ALLWEAPON { 0x00020000 }
505sub PU_MAGICAL { 0x00040000 }
506sub PU_POTION { 0x00080000 }
507
508sub PU_SPELLBOOK { 0x00100000 }
509sub PU_SKILLSCROLL { 0x00200000 }
510sub PU_READABLES { 0x00400000 }
511sub PU_MAGIC_DEVICE { 0x00800000 }
512
513sub PU_NOT_CURSED { 0x01000000 }
514
515sub PU_JEWELS { 0x02000000 }
516
517
4721; 5181;
473 519
474=back 520=back
475 521
476=head1 AUTHOR 522=head1 AUTHOR

Diff Legend

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