--- deliantra/Deliantra-Client/DC.pm	2006/07/16 20:04:07	1.100
+++ deliantra/Deliantra-Client/DC.pm	2006/07/22 12:18:01	1.101
@@ -338,6 +338,11 @@
       } elsif ($ev->{button} == 2) {
          $::CONN->send ("apply $self->{tag}");
       } elsif ($ev->{button} == 3) {
+         my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
+         if ($self->{container} == $::CONN->{open_container}) {
+            $move_prefix = "take";
+         }
+
          my @menu_items = (
             ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
             ["mark",    sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
@@ -355,8 +360,8 @@
                  )
                : (
                   ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
-                  ["drop",   sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
-                  ["move n", 
+                  ["$move_prefix all",   sub { $::CONN->send ("move $targ $self->{tag} 0") }],
+                  ["$move_prefix n", 
                      sub {
                         do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
                      }