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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.97 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC

 use Crossfire::Protocol::Base 0.95;
 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;
    my @cmd_help = map {
       $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
    } while $self->{texture}[$id];
    CFPlus::DB::get tilecache => $id, sub {
       my ($data) = @_;
+      return unless $self->{map}; # stop when destroyed
       $self->set_texture ($id => $data)
          if defined $data;
       $self->bg_fetch;
    };
 }
 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) {
          $data = Compress::LZF::decompress $data;
          #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;
       }
    };
 }
          $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
             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";
             $x += $self->{map}->ox;
 sub map_change {
    my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
    $self->flush_map;
+   ++$self->{map_change_gen};
    my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
    my $mapmapw = $self->{mapmap}->{w};
    my $mapmaph = $self->{mapmap}->{h};
       if $changed;
    $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 {
+   $self->{texture}[$id] = my $tex =
-      my $tex =
-         new_from_image CFPlus::Texture
+      new_from_image CFPlus::Texture
-            $data, minify => 1, mipmap => 1;
+         $data, minify => 1, mipmap => 1;
-      $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+   $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
-      $self->{map_widget}->update;
+   $self->{map_widget}->update;
-      $tex
-   };
 }
 sub sound_play {
    my ($self, $x, $y, $soundnum, $type) = @_;
    $LAST_QUERY = $prompt;
    $self->{query}-> ($self, $flags, $prompt);
 }
+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],
+);
 sub drawinfo {
    my ($self, $color, $text) = @_;
-   my @color = (
+   my $fg = $CF_COLOR[$color % @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],
-   );
-   my $fg = $color[$color % @color];
    $self->logprint ("info: ", $text);
-   # try to create single paragraphs of multiple lines sent by the server
+   ## try to create single paragraphs of multiple lines sent by the server
+   # no longer neecssary with TRT servers
-   $text =~ s/(?<=\S)\n(?=\w)/ /g;
+   #$text =~ s/(?<=\S)\n(?=\w)/ /g;
    $text = CFPlus::asxml $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
    $::SERVER_INFO->set_markup (
       "server <tt>$self->{host}:$self->{port}</tt>\n"
     . "protocol version <tt>$self->{version}</tt>\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"
    );

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.97 by root, Fri Apr 6 08:09:43 2007 UTC vs. Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.97 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC