--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/09/02 08:44:28	1.174
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/12/26 18:09:30	1.180
@@ -3,7 +3,7 @@
 use utf8;
 use strict;
 
-use Crossfire::Protocol::Constants;
+use Deliantra::Protocol::Constants;
 
 use CFPlus;
 use CFPlus::DB;
@@ -12,7 +12,7 @@
 use CFPlus::Macro;
 use CFPlus::Item;
 
-use base 'Crossfire::Protocol::Base';
+use base 'Deliantra::Protocol::Base';
 
 sub new {
    my ($class, %arg) = @_;
@@ -21,9 +21,8 @@
       setup_req => {
          extmap => 1,
          excmd  => 1,
-         #xwidget2 => 1,#d#
+         widget => 1,
          %{$arg{setup_req} || {}},
-         msg    => 0,
       },
    );
 
@@ -297,7 +296,7 @@
 sub logprint {
    my ($self, @a) = @_;
 
-   CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
+   CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
 }
 
 sub _stat_numdiff {
@@ -616,11 +615,10 @@
 
    if ($delay) {
       # delay the map drawing a tiny bit in the hope of getting the missing fetched
-      Event->timer (after => 0.03, cb => sub {
-         $_[0]->w->cancel;
+      EV::once undef, 0, 0.03, sub {
          $self->{map_widget}->update
             if $self->{map_widget};
-      });
+      };
    } else {
       $self->{map_widget}->update;
    }
@@ -1306,8 +1304,6 @@
 
    $self->update_server_info;
 
-   $self->send_command ("output-sync $::CFG->{output_sync}");
-   $self->send_command ("output-count $::CFG->{output_count}");
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $self->send_command ("pickup $::CFG->{pickup}");
 }