--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/04/06 08:09:43 1.97 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/06/24 03:46:46 1.107 @@ -17,9 +17,15 @@ use base 'Crossfire::Protocol::Base'; sub new { - my $class = shift; + my ($class, %arg) = @_; - my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); + my $self = $class->SUPER::new (%arg, + setup_req => { + extmap => 1, + excmd => 1, + %{$arg{setup_req} || {}}, + }, + ); $self->{map_widget}->clr_commands; @@ -245,9 +251,7 @@ $::GAUGES->{grace} ->set_value ($gr, $gr_m); $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); - my $rng = $stats->{+CS_STAT_RANGE}; - $rng =~ s/^Range: //; # thank you so much dear server - $::GAUGES->{range} ->set_text ("Rng: " . $rng); + $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); my $title = $stats->{+CS_STAT_TITLE}; $title =~ s/^Player: //; $::STATWIDS->{title} ->set_text ("Title: " . $title); @@ -417,6 +421,8 @@ CFPlus::DB::get tilecache => $id, sub { my ($data) = @_; + return unless $self->{map}; # stop when destroyed + $self->set_texture ($id => $data) if defined $data; @@ -427,7 +433,11 @@ sub load_map($$$) { my ($self, $hash, $x, $y) = @_; + my $gen = $self->{map_change_gen}; + CFPlus::DB::get $self->{mapcache} => $hash, sub { + return unless $gen == $self->{map_change_gen}; + my ($data) = @_; if (defined $data) { @@ -435,7 +445,7 @@ #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# my $inprogress = @{ $self->{bg_fetch} || [] }; - push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); + unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); $self->bg_fetch unless $inprogress; } }; @@ -512,7 +522,10 @@ if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; } else { + my $gen = $self->{map_change_gen}; $self->send_mapinfo ("spatial $path$tile", sub { + return unless $gen == $self->{map_change_gen}; + my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; return if $mode ne "spatial"; @@ -537,6 +550,8 @@ $self->flush_map; + ++$self->{map_change_gen}; + my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); my $mapmapw = $self->{mapmap}->{w}; @@ -585,19 +600,21 @@ $self->set_texture ($face->{id} => delete $face->{image}); } +sub smooth_update { + my ($self, $facenum, $face) = @_; + + $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); +} + sub set_texture { my ($self, $id, $data) = @_; - $self->{texture}[$id] ||= do { - my $tex = - new_from_image CFPlus::Texture - $data, minify => 1, mipmap => 1; + $self->{texture}[$id] = my $tex = + new_from_image CFPlus::Texture + $data, minify => 1, mipmap => 1; - $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); - $self->{map_widget}->update; - - $tex - }; + $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); + $self->{map_widget}->update; } sub sound_play { @@ -617,51 +634,75 @@ $self->{query}-> ($self, $flags, $prompt); } -sub drawinfo { - my ($self, $color, $text) = @_; - - my @color = ( - [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], - [1.00, 1.00, 1.00], - [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] - [1.00, 0.00, 0.00], - [1.00, 0.54, 0.00], - [0.11, 0.56, 1.00], - [0.93, 0.46, 0.00], - [0.18, 0.54, 0.34], - [0.56, 0.73, 0.56], - [0.80, 0.80, 0.80], - [0.75, 0.61, 0.20], - [0.99, 0.77, 0.26], - [0.74, 0.65, 0.41], - ); - - my $fg = $color[$color % @color]; - - $self->logprint ("info: ", $text); - - # try to create single paragraphs of multiple lines sent by the server - $text =~ s/(?<=\S)\n(?=\w)/ /g; +our %NAME_TO_COLOR = ( + black => 0, + white => 1, + darkblue => 2, + red => 3, + orange => 4, + lightblue => 5, + darkorange => 6, + green => 7, + darkgreen => 8, + grey => 9, + brown => 10, + yellow => 11, + tan => 12, +); - $text = CFPlus::asxml $text; - $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g; - $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; +our @CF_COLOR = ( + [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], + [1.00, 1.00, 1.00], + [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] + [1.00, 0.00, 0.00], + [1.00, 0.54, 0.00], + [0.11, 0.56, 1.00], + [0.93, 0.46, 0.00], + [0.18, 0.54, 0.34], + [0.56, 0.73, 0.56], + [0.80, 0.80, 0.80], + [0.75, 0.61, 0.20], + [0.99, 0.77, 0.26], + [0.74, 0.65, 0.41], +); - ::message ({ fg => $fg, markup => $_ }) - for split /\n/, $text; +sub msg { + my ($self, $color, $type, $text, @extra) = @_; - $self->{statusbox}->add ($text, - group => $text, - fg => $fg, - timeout => $color >= 2 ? 180 : 10, - tooltip_font => $::FONT_FIXED, - ); -} + # we now weed out all tags we do not support + $text =~ s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; + # now all entities + $text =~ s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; + + # handle some elements + $text =~ s/(.*?)<\/fg>/$2<\/span>/gs; + $text =~ s/(.*?)<\/fg>/$2<\/span>/gs; + + if (my $cb = $self->{cb_msg}{$type}) { + $_->($self, $color, $type, $text, @extra) for values %$cb; + } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { + $type =~ s/-/_/g; + $self->{$type} = $text; + } else { + $self->logprint ("msg: ", $text); + return if $color < 0; # negative color == ignore if not understood -sub drawextinfo { - my ($self, $color, $type, $subtype, $message) = @_; + my $fg = $CF_COLOR[$color % @CF_COLOR]; - $self->drawinfo ($color, $message); + ## 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 => $_ }) + for split /\n/, $text; + + $self->{statusbox}->add ($text, + group => $text, + fg => $fg, + timeout => $color >= 2 ? 180 : 10, + tooltip_font => $::FONT_FIXED, + ); + } } sub spell_add { @@ -904,8 +945,10 @@ . "protocol version $self->{version}\n" . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" + . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" . "editing support $yesno[!!$self->{editor_support}]\n" . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" + . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" . "cfplus support $yesno[$self->{cfplus_ext} > 0]" . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" . "map size $self->{mapw}×$self->{maph}\n"