--- deliantra/Deliantra-Client/DC/Main.pm	2012/01/05 05:37:02	1.9
+++ deliantra/Deliantra-Client/DC/Main.pm	2012/01/18 00:51:41	1.16
@@ -59,6 +59,7 @@
 }
 
 use DC::OpenGL ();
+use DC::Audio ();
 use DC::Protocol;
 use DC::DB;
 use DC::UI;
@@ -198,7 +199,7 @@
    $msg =~ s/\s+$//;
 
    # backtrace as second step, in case it crashes, too
-   crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
+   crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated"
       if $backtrace;
 };
 
@@ -210,7 +211,7 @@
    return unless $CONN;
 
    $CONN->send_exti_msg (clientlog => $msg);
-   $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
+   $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace;
 }
 
 #############################################################################
@@ -475,25 +476,9 @@
 
 sub audio_init {
    if ($CFG->{audio_enable}) {
-      if (length $CFG->{audio_driver}) {
-         local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
-         DC::SDL_Init DC::SDL_INIT_AUDIO
-            and die "SDL::Init failed!\n";
-      } else {
-         DC::SDL_Init DC::SDL_INIT_AUDIO
-            and die "SDL::Init failed!\n";
-      }
-
-      $ENV{MIX_EFFECTSMAXSPEED} = 1;
-      $SDL_MIXER = !DC::Mix_OpenAudio
-         $CFG->{audio_hw_frequency},
-         DC::MIX_DEFAULT_FORMAT,
-         $CFG->{audio_hw_channels},
-         $CFG->{audio_hw_chunksize};
+      DC::Audio::init $CFG->{audio_driver};
 
       if ($SDL_MIXER) {
-         DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
-
          audio_music_finished;
       } else {
          status "Unable to open sound device: there will be no sound";
@@ -599,9 +584,10 @@
          if ($fh) {
             $error ||= Coro::AIO::aio_stat "$override.tmp";
             $error ||= -s _ != $size;
-            $error ||= Coro::AIO::aio_readahead $fh, 0, $size;
+            Coro::AIO::aio_readahead $fh, 0, $size;
 
             my $f_md5 = new Digest::MD5;
+            binmode $fh; # ugh :(
             $f_md5->addfile ($fh);
             $f_md5 = $f_md5->hexdigest;
             $error ||= $md5 ne $f_md5;
@@ -966,7 +952,7 @@
 
          c_version => {
             client     => "deliantra",
-            clientver  => $DC::VERSION,
+            clientver  => "$DC::VERSION$Urlader::EXE_VER",
             gl_vendor  => DC::OpenGL::gl_vendor,
             gl_version => DC::OpenGL::gl_version,
          },
@@ -2700,6 +2686,8 @@
    $FULLSCREEN = $CFG->{fullscreen};
    $FAST       = $CFG->{fast};
 
+   DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
+
    # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
    DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
       or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
@@ -2987,56 +2975,12 @@
          DC::write_cfg;
       }
 
+      DC::upgrade_cfg;
+
       DC::DB::open_db;
 
       DC::UI::set_layout ($::CFG->{layout});
 
-      my %DEF_CFG = (
-         config_autosave     => 1,
-         sdl_mode            => undef,
-         fullscreen          => 1,
-         fast                => 0,
-         force_opengl11      => undef,
-         disable_alpha       => 0,
-         smooth_movement     => 1,
-         smooth_transitions  => 1,
-         texture_compression => 1,
-         map_scale           => 1,
-         fow_enable          => 1,
-         fow_intensity       => 0,
-         fow_texture         => 0,
-         map_smoothing       => 1,
-         gui_fontsize        => 1,
-         log_fontsize        => 0.7,
-         gauge_fontsize      => 1,
-         gauge_size          => 0.35,
-         stat_fontsize       => 0.7,
-         mapsize             => 100,
-         audio_enable        => 1,
-         audio_hw_channels   => 0,
-         audio_hw_frequency  => 0,
-         audio_hw_chunksize  => 0,
-         audio_mix_channels  => 8,
-         effects_enable      => 1,
-         effects_volume      => 1,
-         bgm_enable          => 1,
-         bgm_volume          => 0.5,
-         output_rate         => "",
-         pickup              => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
-         inv_sort            => "mtime",
-         default             => "profile", # default profile
-         show_tips           => 1,
-         logview_max_par     => 1000,
-         shift_fire_stop     => 0,
-         uitheme             => "wood",
-         map_shift_x         => -24, # arbitrary
-         map_shift_y         => +24, # arbitrary
-      );
-
-      while (my ($k, $v) = each %DEF_CFG) {
-         $CFG->{$k} = $v unless exists $CFG->{$k};
-      }
-
       my @args = @ARGV;
 
       # OS X passes some process serial number of other shit. they