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

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.14 by root, Tue Apr 24 18:24:31 2007 UTC vs.
Revision 1.20 by elmex, Thu Jun 28 08:34:42 2007 UTC

-#! perl
+#! perl # depends=irc
 #CONVERSION: PARTIAL
 # implement a replacement for the built-in say/chat/shout/tell/reply commands
 # adds ignore/unignore functionality
          } elsif (!cf::player::exists $k) {
             $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN | cf::NDI_UNIQUE);
             delete $hash->{$k};
          }
       }
+   }
+}
+# send_irc ($format, @args, $msg)
+# make sure the last argument is the message!
+sub send_irc {
+   my ($format, @args) = @_;
+   my $msg = pop @args;
+   for (split /\n/, $msg) {
+      ext::irc::do_notice (sprintf $format, @args, $_)
    }
 }
 cf::player->attach (
    prio     => -1000,
    return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
    if ($msg) {
       my $name = $pl->name;
-      utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
          for grep $pl->on_same_map_as ($_->ob), cf::player::list;
-      utf8::decode $msg;
       # npcs, magic_ears etc.
-      # first find all objects and theirt-level inventories
+      # first find all objects and their first-level inventories
-      # within a 5x5 square # that have something resembling
+      # within a 5x5 square that have something resembling
       # dialogue or support on_say.
       my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2);
       for my $npc (
          grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
                      0..24
       ) {
          # if some listener teleported us somewhere else, stop right here
          last unless $map->path == $pl->map->path;
-         my $dialog = new NPC_Dialogue ob => $pl, npc => $npc;
+         my $dialog = new NPC_Dialogue pl => $pl->contr, npc => $npc;
          my ($reply, @kw) = $dialog->tell ($msg);
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
                if (length $reply) {
    if ($msg) {
       my $name = $pl->name;
       my $NOW = time;
-      utf8::encode $msg; # ->message not yet utf8-ified
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
-      ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg);
+      send_irc ("[%s] %s", $name, $msg);
       $_->ob->message ("$name chats: $msg", cf::NDI_BLUE)
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
    } else {
    if ($msg) {
       my $NOW = time;
       my $name = $pl->name;
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
-      ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg);
+      send_irc ("\007\0034{%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 {
       $pl->message ("Shout what?", cf::NDI_UNIQUE);
    my $name = $pl->name;
    if ($target =~ /irc\//) {
       my (undef, $nick) = split /\//, $target, 2;
       $pl->message ("You tell $target: $args");
-      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg);
+      send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
    } elsif (my $other = cf::player::find_active $target) {
       if ($msg) {
          if ($target eq $name) {
             $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
          } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
             $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
          } else {
             return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg);
-            utf8::encode $msg; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
             $pl->message ("You tell $target: $msg");
             $other->ob->message ("$name tells you: $msg");
             $other->ob->{ext_last_tell} = $name;
    return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
    if ($pl->{ext_last_tell} =~ /irc\//) {
       my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
       $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
-      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
+      send_irc ("(%s) %s: %s\n", $name, $nick, $args);
    } elsif (my $other = cf::player::find_active $pl->{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 $args; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
             $pl->message ("You tell " . $other->ob->name . ": $args");
             $other->ob->message ("$name tells you: $args");
             $pl->{ext_last_tell} = $other->ob->name;

Diff Legend

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

Comparing deliantra/server/ext/chat.ext (file contents): Revision 1.14 by root, Tue Apr 24 18:24:31 2007 UTC vs. Revision 1.20 by elmex, Thu Jun 28 08:34:42 2007 UTC

Diff Legend

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.14 by root, Tue Apr 24 18:24:31 2007 UTC vs.
Revision 1.20 by elmex, Thu Jun 28 08:34:42 2007 UTC