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.122 by root, Wed Dec 5 10:49:17 2007 UTC vs.
Revision 1.123 by elmex, Wed Dec 26 11:42:58 2007 UTC

326 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & CFPlus::KMOD_SHIFT) {
327 $self->{shft}++; 327 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
330 } 330 }
331 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & CFPlus::KMOD_CTRL) {
333 $self->{ctrl}++; 333 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]"); 334 $::CONN->user_send ("run $dir->[0]");
335 } else { 335 } else {
336 $::CONN->user_send ("$dir->[1]"); 336 $::CONN->user_send ("$dir->[1]");
354 $::CONN->user_send ("fire_stop"); 354 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 355 delete $self->{fire_dir};
356 $res = 1; 356 $res = 1;
357 } 357 }
358 } else { 358 } else {
359 if (exists $DIR{$sym} && delete $self->{shft}) { 359 if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 360 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 361 delete $self->{fire_dir};
362 $res = 1; 362 $res = 1;
363 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 363 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT)
364 && delete $self->{shft}) { # XXX: is RSHIFT ok?
364 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
365 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
366 $res = 1; 367 $res = 1;
367 } 368 }
368 } 369 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines