--- deliantra/Deliantra-Client/bin/cfplus	2007/05/09 11:46:49	1.154
+++ deliantra/Deliantra-Client/bin/cfplus	2007/07/05 06:49:10	1.159
@@ -1,6 +1,7 @@
 #!/opt/bin/perl
 
 my $startup_done = sub { };
+our $PANGO = "1.5.0";
 
 # do splash-screen thingy on win32
 BEGIN {
@@ -45,8 +46,8 @@
          # relocatable
       } else {
          # unix, need to patch pango rc file
-         open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
-            or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
+         open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
+            or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
          local $/;
          my $rc = <$fh>;
          $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
@@ -497,6 +498,7 @@
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
    $SPELL_LIST->clear_spells;
+   $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
 
    return unless $CONN;
 
@@ -747,7 +749,7 @@
    $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
    $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
    $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
-   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
+   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
 
    my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
 
@@ -1455,7 +1457,7 @@
 
    my $ntb =
       $PL_NOTEBOOK =
-         new CFPlus::UI::Notebook expand => 1, debug => 1;
+         new CFPlus::UI::Notebook expand => 1;
 
    $ntb->add (
       "Statistics (F2)" => $STATS_PAGE = stats_window,
@@ -1477,6 +1479,8 @@
       "Toggles the inventory window, where you can manage your loot (or treasures :). "
       . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
    );
+   $ntb->add (Pickup   => autopickup_setup,
+      "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
 
    $ntb->set_current_page ($INVENTORY_PAGE);
 
@@ -1813,8 +1817,6 @@
          "Configure the server to play on, your username, password and other server-related options.");
       $SETUP_NOTEBOOK->add (Client   => client_setup,
          "Configure various client-specific settings.");
-      $SETUP_NOTEBOOK->add (Pickup   => autopickup_setup,
-         "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
       $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
          "Configure the video mode, performance, fonts and other graphical aspects of the game.");
       $SETUP_NOTEBOOK->add (Audio    => audio_setup,