[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 2007 UTC

          if $ev->{play};
    });
    $self->connect_ext (capabilities => sub {
       my (%cap) = @_;
+      #$self->send ("setup sound 0"); # we use a different protocol
       $self->send_exti_msg (fx_want => {
          3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
          5 => !!$::CFG->{audio_enable}, # FT_SOUND
       });
    # message window
    $self->connect_ext (channel_info => sub {
       my ($info) = @_;
       $self->{channels}->{$info->{id}} = $info;
-      $::MESSAGE_WINDOW->add_channel ($_[0]);
+      $::MESSAGE_WINDOW->add_channel ($info);
    });
    # destroy widgets on logout
    $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
       for my $ws (values %{delete $self->{widgetset} || {}}) {
       $self->set_texture ($face->{id} => delete $face->{data});
    } elsif ($face->{type} & 1) { # split metadata
       my $cb = sub { };
+      my $path;
       if ($face->{type} == 3) { # FT_MUSIC
+         # store externally
+         $path = CFPlus::DB::path_of_res $face->{name};
          $cb = sub {
             $self->{music_meta}{$facenum} = $face;
             ::message ({ markup => "downloaded song #$facenum" })
                if $changed;
             &::audio_music_set ($self->{songs});
          };
+      } elsif ($face->{type} == 5) { # FT_SOUND
+         $cb = sub {
+            $self->{sound_meta}{$facenum} = $face;
+            use Data::Dumper; warn Dumper $face;#d#
+            ::message ({ markup => "downloaded sound #$facenum" })
+               if $changed;
-      }
+         };
+      }
       if ($changed) { # new data
          my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
-         my $path = CFPlus::DB::path_of_res $face->{name};
-         CFPlus::DB::write_file $path, $data, sub {
+         my $put_cb = sub {
             CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
                $face->{meta} = $self->{json_coder}->decode ($meta_json);
                $face->{path} = $path;
                $cb->();
             };
          };
+         if (defined $path) {
+            CFPlus::DB::write_file $path, $data, $put_cb;
+         } else {
+            CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
+         }
       } else {
          $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+         $face->{path} = $path;
          $cb->();
       }
    }
 }
    }
 }
 sub sound_play {
    my ($self, $x, $y, $soundnum, $type) = @_;
+   warn "sound play <@_>\n";#d#
-   $self->{sound_play}->($x, $y, $soundnum, $type);
+   #$self->{sound_play}->($x, $y, $soundnum, $type);
 }
 my $LAST_QUERY; # server is stupid, stupid, stupid
 sub query {
       $self->{$type} = $text;
    } else {
       $self->logprint ("msg: ", $text);
       return if $color < 0; # negative color == ignore if not understood
-      my $fg = $CF_COLOR[$color % @CF_COLOR];
+      my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
       ## try to create single paragraphs of multiple lines sent by the server
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
-      ::message ({ fg => $fg, markup => $_, type => $type })
+      ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
          for split /\n/, $text;
       $self->{statusbox}->add ($text,
          group        => $text,
          fg           => $fg,
    my ($self) = @_;
    $self->{map_widget}->clr_commands;
    ::stop_game ();
-}
-sub image_info {
-   my ($self, $numfaces) = @_;
-   $self->{num_faces} = $numfaces;
-   $self->{face_prefetch} = [1 .. $numfaces];
-   $self->face_prefetch;
-}
-sub face_prefetch {
-   my ($self) = @_;
-   return unless $::CFG->{face_prefetch};
-   if ($self->{num_faces}) {
-      return if @{ $self->{send_queue} || [] };
-      my $todo = @{ $self->{face_prefetch} }
-         or return;
-      my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
-      $self->send ("requestinfo image_sums $face $face");
-      $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
-         group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
-   } elsif (!exists $self->{num_faces}) {
-      $self->send ("requestinfo image_info");
-      $self->{num_faces} = 0;
-      $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
-         group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
-   }
 }
 sub update_floorbox {
    $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
       return unless $::CONN;
     . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"
    );
-   ::setup_build_button ($self->{editor_support}->{builder_ui});
 }
 sub logged_in {
    my ($self) = @_;
    $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}");
-}
-sub buildat {
-   my ($self, $builditem, $x, $y) = @_;
-   if ($self->{cfplus_ext}) {
-      $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
-   }
 }
 sub lookat {
    my ($self, $x, $y) = @_;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs. Revision 1.139 by root, Sun Jul 29 18:22:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 2007 UTC