--- deliantra/Deliantra-Client/DC/Main.pm	2012/11/17 10:40:09	1.24
+++ deliantra/Deliantra-Client/DC/Main.pm	2017/01/29 00:11:23	1.30
@@ -513,7 +513,7 @@
 
 sub audio_init {
    if ($CFG->{audio_enable}) {
-      DC::Audio::init $CFG->{audio_driver};
+      DC::Audio::init;
 
       if ($SDL_MIXER) {
          audio_music_finished;
@@ -1180,7 +1180,7 @@
          state => $CFG->{texture_compression},
          tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
                   . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
-                  . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
+                  . "The compression algorithm can differ from card to card, so your mileage may vary. This setting is ignored in "
                   . "forced OpenGL 1.1 mode and when using the Apple renderer.",
          on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
       );
@@ -1542,7 +1542,7 @@
    if ($DELIANTRA_DEBUG & 16) {
       $BW_WATCHER = EV::periodic 0, 1, 0, sub {
          return unless $CONN;
-         debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
+         debug sprintf "%8.2gkB/s", $CONN->{octets_in} / 1e3;
          $CONN->{octets_in} = 0;
       };
    } else {
@@ -1917,7 +1917,7 @@
       },
       on_changed => sub {
          my ($self, $value) = @_;
-         $PROFILE->{password} = pack "H*", Deliantra::Util::hash_pw $value
+         $PROFILE->{password} = unpack "H*", Deliantra::Util::hash_pw $value
             if length $value && $value ne $nullpw;
          1
       },
@@ -1957,7 +1957,7 @@
 
    $vbox->add (new DC::UI::FancyFrame
       label => "Server Message",
-      tooltip => "The last message, or error, form the server.",
+      tooltip => "The last message, or error, from the server.",
       child => ($LOGIN_ERROR = new DC::UI::Label valign => 0, ellipsise => 0),
    );
 
@@ -2030,7 +2030,7 @@
       text => $CFG->{output_rate},
       tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
                . "when sending data. When 0 or unset, the server "
-               . "default will be used, which is usually around 100kb/s. Most servers will "
+               . "default will be used, which is usually around 100kB/s. Most servers will "
                . "dynamically find an optimal rate, so adjust this only when necessary.",
       on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
    );
@@ -2597,8 +2597,8 @@
    $MENUPOPUP = DC::UI::Menu->new (items => [
       ["Setup…\tF9"        , sub { $SETUP_DIALOG->toggle_visibility }],
       ["Playerbook…\tTab"  , sub { $PL_WINDOW   ->toggle_visibility }],
-      ["…Statistics\tF2"    , sub { toggle_player_page ($::STATS_PAGE) }],
-      ["…Skills\tF3"        , sub { toggle_player_page ($::SKILL_PAGE) }],
+      ["…Statistics\tF2"   , sub { toggle_player_page ($::STATS_PAGE) }],
+      ["…Skills\tF3"       , sub { toggle_player_page ($::SKILL_PAGE) }],
       ["…Spells\tF4"       , sub { toggle_player_page ($::SPELL_PAGE) }],
       ["…Inventory\tF5"    , sub { toggle_player_page ($::INVENTORY_PAGE) }],
       ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
@@ -2606,7 +2606,7 @@
          if ($CONN) {
             open_quit_dialog;
          } else {
-            EV::unloop EV::UNLOOP_ALL;
+            EV::break EV::BREAK_ALL;
          }
       }],
    ]);
@@ -2987,7 +2987,7 @@
 
 $SDL_CB[DC::SDL_QUIT] = sub {
    crash "SDL_QUIT";
-   EV::unloop EV::UNLOOP_ALL;
+   EV::break EV::BREAK_ALL;
 };
 $SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
 $SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
@@ -3030,7 +3030,7 @@
 #############################################################################
 
 $SIG{INT} = $SIG{TERM} = sub {
-   EV::unloop;
+   EV::break;
    #d# TODO calling exit here hangs the process in some futex
 };
 
@@ -3157,7 +3157,7 @@
       debug_toggle 0;
 
       delete $SIG{__DIE__};
-      EV::loop;
+      EV::run;
 
       DC::save_cfg if $CFG->{config_autosave};