--- deliantra/Deliantra-Client/bin/cfplus	2007/04/12 07:53:31	1.149
+++ deliantra/Deliantra-Client/bin/cfplus	2007/05/09 11:46:49	1.154
@@ -31,17 +31,38 @@
    if (%PAR::LibCache) {
       @INC = grep ref, @INC; # weed out all paths except pars loader refs
 
+      my $tmp = $ENV{PAR_TEMP};
+
       while (my ($filename, $zip) = each %PAR::LibCache) {
          for ($zip->memberNames) {
             next unless /^root\/(.*)/;
-            $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
-               unless -e "$ENV{PAR_TEMP}/$1";
+            $zip->extractMember ($_, "$tmp/$1")
+               unless -e "$tmp/$1";
          }
       }
 
-      # TODO: pango-rc file, anybody?
+      if ($^O eq "MSWin32") {
+         # 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: $!";
+         local $/;
+         my $rc = <$fh>;
+         $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
+
+         mkdir "$tmp/pango-modules";
+         open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
+            or die "$tmp/pango-modules/pango.modules: $!";
+         print $fh $rc;
+
+         $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
+         open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
+            or die "$ENV{PANGO_RC_FILE}: $!";
+         print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
+      }
 
-      unshift @INC, $ENV{PAR_TEMP};
+      unshift @INC, $tmp;
    }
 }
 
@@ -209,7 +230,7 @@
    ;
 
    my @dialog = my $label = new CFPlus::UI::Label
-      max_w     => $::WIDTH * 0.4,
+      max_w     => $::WIDTH * 0.8,
       ellipsise => 0,
       text      => $prompt;
 
@@ -236,13 +257,11 @@
       $dialog->grab_focus;
 
    } elsif ($flags & CS_QUERY_SINGLECHAR) {
-      $dialog->{tooltip} = "#charcreation_focus";
-
       if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
-         $MESSAGE_WINDOW->show;
+         $dialog->{tooltip} = "#charcreation_focus";
 
          unshift @dialog, new CFPlus::UI::Label
-            max_w     => $::WIDTH * 0.4,
+            max_w     => $::WIDTH * 0.8,
             ellipsise => 0,
             markup    => "\nOr use your keyboard and the text entry below:\n";
 
@@ -265,6 +284,29 @@
              },
          );
 
+         if ($conn->{chargen_race_description}) {
+            unshift @dialog, new CFPlus::UI::Label
+               max_w     => $::WIDTH * 0.8,
+               ellipsise => 0,
+               markup    => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
+            ;
+         }
+
+         unshift @dialog, new CFPlus::UI::Face
+            face  => $conn->{player}{face},
+            bg    => [.2, .2, .2, 1],
+            min_w => 64,
+            min_h => 64,
+         ;
+
+         if ($conn->{chargen_race_title}) {
+            unshift @dialog, new CFPlus::UI::Label
+               allign => 1,
+               ellipsise => 0,
+               markup    => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
+            ;
+         }
+
          unshift @dialog, new CFPlus::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
@@ -2081,7 +2123,7 @@
 
 %SDL_CB = (
    CFPlus::SDL_QUIT => sub {
-      Event::unloop -1;
+      exit;
    },
    CFPlus::SDL_VIDEORESIZE => sub {
    },
@@ -2236,7 +2278,10 @@
 #CFPlus::SDL_Quit;
 #CFPlus::_exit 0;
 
-END { CFPlus::SDL_Quit }
+END {
+   CFPlus::SDL_Quit;
+   CFPlus::DB::Server::stop;
+}
 
 =head1 NAME