ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.320 by root, Tue Jul 24 22:49:40 2007 UTC vs.
Revision 1.323 by root, Sat Jul 28 12:02:58 2007 UTC

2512sub cf::client::send_msg { 2512sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2513 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2514
2515 $msg = $self->pl->expand_cfpod ($msg); 2515 $msg = $self->pl->expand_cfpod ($msg);
2516 2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2517 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2518
2519 if (ref $channel) { 2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2522 $self->{channel}{$channel->{id}} = $channel;
2527 } 2527 }
2528 2528
2529 return unless @extra || length $msg; 2529 return unless @extra || length $msg;
2530 2530
2531 if ($self->can_msg) { 2531 if ($self->can_msg) {
2532 # default colour, mask it out
2533 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2534 if $color & cf::NDI_DEF;
2535
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2536 $self->send_packet ("msg " . $self->{json_coder}->encode (
2537 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2538 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2539 if ($color >= 0) {
2540 # replace some tags by gcfclient-compatible ones
2541 for ($msg) {
2542 1 while
2543 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2544 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2545 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2546 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 }
2549
2550 $color &= cf::NDI_COLOR_MASK;
2551
2545 if (0 && $msg =~ /\[/) { 2552 if (0 && $msg =~ /\[/) {
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 4 0 $msg")
2547 } else { 2554 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2865 # TODO: for gcfclient pleasure, we should give resources 2872 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2873 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2874 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2875 my $enc = JSON::XS->new->utf8->canonical;
2869 2876
2870 if (my $soundconf = delete $res->{"res/sound.conf"}) { 2877 my $soundconf = delete $res->{"res/sound.conf"};
2871 $soundconf = $enc->decode (delete $soundconf->{data});
2872 # todo
2873 }
2874 2878
2875 while (my ($name, $info) = each %$res) { 2879 while (my ($name, $info) = each %$res) {
2876 my $meta = $enc->encode ({ 2880 my $meta = $enc->encode ({
2877 name => $name, 2881 name => $name,
2878 %{ $info->{meta} || {} }, 2882 %{ $info->{meta} || {} },
2892 } 2896 }
2893 2897
2894 cf::face::set_type $idx, $info->{type}; 2898 cf::face::set_type $idx, $info->{type};
2895 2899
2896 cf::cede_to_tick; 2900 cf::cede_to_tick;
2901 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 #TODO
2897 } 2917 }
2898 } 2918 }
2899 2919
2900 1 2920 1
2901} 2921}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines