--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/09/02 03:55:03 1.172 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/10/14 15:33:30 1.176 @@ -12,8 +12,6 @@ use CFPlus::Macro; use CFPlus::Item; -use Crossfire::Protocol::Base 0.95; - use base 'Crossfire::Protocol::Base'; sub new { @@ -971,7 +969,11 @@ local $_ = shift; # we now weed out all tags we do not support - s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; + s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) + }{ + "<" + }gex; + # now all entities s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; @@ -1055,7 +1057,7 @@ fg => $fg, timeout => $color >= 2 ? 180 : 10, tooltip_font => $::FONT_FIXED, - ); + ) if $type eq "info"; } } @@ -1303,8 +1305,6 @@ $self->update_server_info; - $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}"); }