--- deliantra/Deliantra-Client/bin/cfplus	2006/05/29 20:12:15	1.26
+++ deliantra/Deliantra-Client/bin/cfplus	2006/05/29 20:22:33	1.27
@@ -103,7 +103,7 @@
 our $INV_WINDOW;
 our $INV;
 our $INVR;
-our $INVR_LBL;
+our $INV_RIGHT_HB;
 
 our $BIND_WINDOW;
 
@@ -943,19 +943,13 @@
 
    $hb->add (my $vb2 = new CFClient::UI::VBox);
 
-   $vb2->add (my $hb2 = new CFClient::UI::HBox);
-   $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
-   $hb2->add (new CFClient::UI::Button
-      text     => "Close container",
-      tooltip  => "Close the currently open container (if one is open)",
-      on_activate => sub {
-         $CONN->send ("apply $CONN->{open_container}")
-            if $CONN->{open_container} != 0;
-      },
-   );
+   $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
 
    $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
 
+   # XXX: Call after $INVR = ... because set_opencont sets the items
+   CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
+
    $invwin
 }