--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/30 07:26:02	1.11
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/03 01:47:14	1.16
@@ -270,7 +270,7 @@
       # I love transactions
       for (1..100) {
          my $txn = $CFClient::DB_ENV->txn_begin;
-         my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);
+         my $status = $self->{facemap}->db_get (id => $id);
          if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
             $id = ($id || 16) + 1;
             if ($self->{facemap}->put (id => $id) == 0
@@ -280,7 +280,7 @@
                goto gotid;
             }
          }
-         $txn->abort;
+         $txn->txn_abort;
       }
 
       CFClient::fatal "maximum number of transaction retries reached - database problems?";
@@ -447,20 +447,20 @@
 
    # TODO
    # create a widget dynamically, using spell face (CF::Protocol downloads them)
+   $::SETUP_SPELLS->add_spell ($spell);
+
    $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
    $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
 }
 
 sub spell_delete {
    my ($self, $spell) = @_;
+   $::SPELL_LIST->remove_spell ($spell);
 }
 
 sub addme_success {
    my ($self) = @_;
 
-   $self->send ("command output-sync $::CFG->{output_sync}");
-   $self->send ("command output-count $::CFG->{output_count}");
-
    my $parser = new Pod::POM;
    my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
 
@@ -606,6 +606,8 @@
       update_container (0);
    } elsif ($tag == $self->{player}{tag}) {
       $::INV->set_items ($self->{container}{$tag})
+   } else {
+      update_container ($tag);
    }
 
 #   use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
@@ -623,7 +625,7 @@
       } elsif ($_->{container} == $self->{player}{tag}) {
          $::INV->set_items ($self->{container}{$self->{player}{tag}})
       } else {
-         update_container ($_->{tag});
+         update_container ($_->{container});
       }
    }
 }
@@ -658,6 +660,10 @@
 sub player_update {
    my ($self, $player) = @_;
    $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+
+   # do it here because it is ignored earlier, and there is no "login" event
+   $self->send_command ("output-sync $::CFG->{output_sync}");
+   $self->send_command ("output-count $::CFG->{output_count}");
 }
 
 1;