--- deliantra/server/lib/cf.pm	2007/07/16 15:27:06	1.309
+++ deliantra/server/lib/cf.pm	2007/07/22 14:17:58	1.313
@@ -169,6 +169,12 @@
 returns directly I<after> the tick processing (and consequently, can only wake one process
 per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
 
+=item @cf::INVOKE_RESULTS
+
+This array contains the results of the last C<invoke ()> call.  When
+C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
+that call.
+
 =back
 
 =cut
@@ -868,18 +874,18 @@
 }
 
 our $override;
-our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
+our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
 
 sub override {
    $override = 1;
-   @invoke_results = (@_);
+   @INVOKE_RESULTS = (@_);
 }
 
 sub do_invoke {
    my $event = shift;
    my $callbacks = shift;
 
-   @invoke_results = ();
+   @INVOKE_RESULTS = ();
 
    local $override;
 
@@ -906,7 +912,7 @@
 
 This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
 removed in future versions), and there is no public API to access override
-results (if you must, access C<@cf::invoke_results> directly).
+results (if you must, access C<@cf::INVOKE_RESULTS> directly).
 
 =back
 
@@ -914,6 +920,17 @@
 
 #############################################################################
 # object support
+#
+
+sub _can_merge {
+   my ($ob1, $ob2) = @_;
+
+   local $Storable::canonical = 1;
+   my $fob1 = Storable::freeze $ob1;
+   my $fob2 = Storable::freeze $ob2;
+
+   $fob1 eq $fob2
+}
 
 sub reattach {
    # basically do the same as instantiate, without calling instantiate
@@ -2421,7 +2438,7 @@
    $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
 }
 
-=item $client->send_msg ($color, $type, $msg, [extra...])
+=item $client->send_msg ($channel, $msg, $color, [extra...])
 
 Send a drawinfo or msg packet to the client, formatting the msg for the
 client if neccessary. C<$type> should be a string identifying the type of
@@ -2431,14 +2448,26 @@
 =cut
 
 sub cf::client::send_msg {
-   my ($self, $color, $type, $msg, @extra) = @_;
+   my ($self, $channel, $msg, $color, @extra) = @_;
 
    $msg = $self->pl->expand_cfpod ($msg);
 
+   $color &= ~cf::NDI_UNIQUE; # just in case...
+
+   if (ref $channel) {
+      # send meta info to client, if not yet sent
+      unless (exists $self->{channel}{$channel->{id}}) {
+         $self->{channel}{$channel->{id}} = $channel;
+         $self->ext_event (channel_info => %$channel);
+      }
+
+      $channel = $channel->{id};
+   }
+
    return unless @extra || length $msg;
 
    if ($self->can_msg) {
-      $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
+      $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
    } else {
       # replace some tags by gcfclient-compatible ones
       for ($msg) {