[ViewVC] Diff of: cvs/deliantra/maps/perl/chat.ext

Comparing deliantra/maps/perl/chat.ext (file contents):
Revision 1.24 by root, Fri Jul 21 08:24:47 2006 UTC vs.
Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC

 };
 cf::register_command say => 0, sub {
    my ($who, $msg) = @_;
+   utf8::decode $msg;
    if ($msg) {
       my $name = $who->name;
+      utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
          for grep $who->on_same_map_as ($_->ob), cf::player::list;
+      utf8::decode $msg;
       # npcs, magic_ears etc.
       # first find all objects and their inventories within a 5x5 square
       # that have something resembling dialogue
       my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2);
       ) {
          # if some listener teleported us somewhere else, stop right here
          last unless $map->path == $who->map->path;
          my $dialog = new NPC_Dialogue ob => $who, npc => $npc;
-         my $reply = $dialog->tell ($msg);
+         my ($reply, @kw) = $dialog->tell ($msg);
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
                if (length $reply) {
                   $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE)
                   $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE)
                      for grep $who->on_same_map_as ($_->ob), cf::player::list;
                }
             }
          }
+         if (@kw) {
+            $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE)
+               for grep $who->on_same_map_as ($_->ob), cf::player::list;
+         }
       }
    } else {
       $who->message ("What do you want to say?", cf::NDI_UNIQUE);
    }
 };
 cf::register_command chat => 0, sub {
    my ($who, $msg) = @_;
+   utf8::decode $msg;
    if ($msg) {
       my $name = $who->name;
       my $NOW = time;
+      utf8::encode $msg; # ->message not yet utf8-ified
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
       $_->ob->message ("$name chats: $msg", cf::NDI_BLUE)
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
    }
 };
 cf::register_command shout => 0, sub {
    my ($who, $msg) = @_;
+   utf8::decode $msg;
    if ($msg) {
       my $NOW = time;
       my $name = $who->name;
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
+      utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
    } else {
       $who->message ("Shout what?", cf::NDI_UNIQUE);
 };
 cf::register_command tell => 0, sub {
    my ($who, $args) = @_;
    my ($target, $msg) = split /\s+/, $args, 2;
+   utf8::decode $msg;
    my $name = $who->name;
    if (my $other = cf::player::find $target) {
          if ($target eq $name) {
             $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
          } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
             $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
          } else {
+            utf8::encode $msg; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
             $who->message ("You tell $target: $msg");
             $other->ob->message ("$name tells you: $msg");
             $other->ob->{ext_last_tell} = $name;
 cf::register_command reply => 0, sub {
    my ($who, $args) = @_;
    my $name = $who->name;
+   utf8::decode $args;
    if (my $other = cf::player::find $who->{ext_last_tell}) {
       if ($args) {
          $other->ob->{ext_ignore_tell}{$name} >= time
             or delete $other->ob->{ext_ignore_tell}{$name};
          if ($other->ob->{ext_ignore_tell}{$name} < time) {
+            utf8::encode $msg; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
             $who->message ("You tell " . $other->ob->name . ": $args");
             $other->ob->message ("$name tells you: $args");
             $who->{ext_last_tell} = $other->ob->name;
          $who->message ("$login is right here on this server!", cf::NDI_UNIQUE);
       } elsif (cf::player::exists $login
                and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
          my $time = (stat _)[9];
-         $who->message ("$login was last seen here on "
+         $who->message ("$login was last seen here "
                         . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
                         . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
       } else {
          $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
       }

Diff Legend

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

Comparing deliantra/maps/perl/chat.ext (file contents): Revision 1.24 by root, Fri Jul 21 08:24:47 2006 UTC vs. Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC

Diff Legend

Comparing deliantra/maps/perl/chat.ext (file contents):
Revision 1.24 by root, Fri Jul 21 08:24:47 2006 UTC vs.
Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC