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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC

 use base 'Crossfire::Protocol::Base';
 sub new {
    my $class = shift;
-   my $self = $class->SUPER::new (@_);
+   my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
    $self->{map_widget}->clr_commands;
    my @cmd_help = map {
       $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
          for @args;
       map ["$cmd$_", $text],
          sort { (length $a) <=> (length $b) }
             @args
+  } sort { $a->{par} <=> $b->{par} }
-  } CFPlus::Pod::find command_help => "*";
+         CFPlus::Pod::find command => "*";
   $self->{map_widget}->add_command (@$_)
      for @cmd_help;
    $self->{noface} = new_from_file CFPlus::Texture
       CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+   {
+      $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
+         CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+      $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+   }
    $self->{open_container} = 0;
    # "global"
-   $self->{tilecache} = CFPlus::db_table "tilecache";
+   $self->{tilecache} = CFPlus::db_table "tilecache"
+      or die "tilecache: unable to open database table";
-   $self->{facemap}   = CFPlus::db_table "facemap";
+   $self->{facemap}   = CFPlus::db_table "facemap"
+      or die "facemap: unable to open database table";
    # per server
-   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
+   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
+      or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
    $self
 }
 sub logprint {
       my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
-      my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my ($x, $y) = (0, 1);
       for (
          sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
          map [$_, $self->{skill_info}{$_}],
          $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
             text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
          $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
-         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
+         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+                      can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
          $x++ and ($x, $y) = (0, $y + 1);
       }
    }
 }
 sub feed_map1a {
    my ($self, $data) = @_;
-   $self->{map}->map1a_update ($data);
+   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
    $self->{map_widget}->update;
 }
 sub magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
       [0.74, 0.65, 0.41],
    );
    $self->logprint ("info: ", $text);
-   my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
    # try to create single paragraphs of multiple lines sent by the server
    $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;
-   $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
+   ::message ({ fg => $color[$color], markup => $_ })
-      for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
+      for split /\n/, $text;
-   $self->{logview}->scroll_to_bottom;
    $self->{statusbox}->add ($text,
       group        => $text,
       fg           => $color[$color],
       timeout      => $color >= 2 ? 180 : 10,
    $::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"
+    . "editing support $yesno[!!$self->{editor_support}]\n"
+    . "map attributes $yesno[$self->{setup}{extmap} > 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"
    );
 }
    my ($self) = @_;
    $self->send_ext_req (cfplus_support => version => 1, sub {
       $self->{cfplus_ext} = $_[0]{version};
       $self->update_server_info;
+      if ($self->{cfplus_ext} >= 2) {
+         $self->send_ext_req ("editor_support", sub {
+            $self->{editor_support} = $_[0];
+            $self->update_server_info;
+            0
+         });
+      }
       0
    });
    $self->update_server_info;
 }
 sub destroy {
    my ($self) = @_;
-   $self->{npc_dialog}->destroy
+   (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
    $self->SUPER::destroy;
 }
 package CFPlus::NPCDialog;
-our @ISA = 'CFPlus::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::Toplevel';
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
    $hbox->add (my $vbox = new CFPlus::UI::VBox);
    $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
    $vbox->add ($self->{entry} = new CFPlus::UI::Entry
-      tooltip     => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
+      tooltip     => "#npc_message_entry",
-                   . "Sometimes you have to tell an NPC something you cannot find out during "
-                   . "a normal conversation (such as a password). In those cases you have to use "
-                   . "this text entry. You can also enter responses manually instead of using the response "
-                   . "buttons below.",
       on_activate => sub {
          my ($entry, $text) = @_;
          return unless $text =~ /\S/;
             padding_y  => 0,
             on_button_up => sub {
                $self->send ($kw);
             };
-         chr 0xfffc
+         "\x{fffc}"
       }giex;
       $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
       $self->{textview}->scroll_to_bottom;
       $self->update_options;
    $self->SUPER::destroy;
 }
 1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.72 by root, Sun Aug 13 02:43:22 2006 UTC vs. Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC