ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC

1081 close $fh; 1081 close $fh;
1082 1082
1083 if (@$objs) { 1083 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1089 close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1091 }
1122 1122
1123 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1125 or return;
1126 1126
1127 my $st = eval { Coro::Storable::thaw $av } 1127 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1128 $av = $st->{objs};
1130 } 1129 }
1131 1130
1132 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1549 1548
1550Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1551 1550
1552=cut 1551=cut
1553 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1554sub expand_cfpod { 1563sub expand_cfpod {
1555 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1556 1565
1557 # escape & and < 1566 my $xml;
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560 1567
1561 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1562 1571
1563 1 while 1572 $group =~ s/&/&amp;/g;
1564 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1565 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1566 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1567 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1577 ([BCGHITU])
1569 # replace G<male|female> tags 1578 <
1570 || s{G<([^>|]*)\|([^>]*)>}{ 1579 (?:
1571 $self->gender ? $2 : $1 1580 ([^<>]*) (?{ $group = $^N })
1572 }ge 1581 | < $interior >
1573 # replace H<hint text> 1582 )
1574 || s{H<([^\>]*)>} 1583 >
1584 %gcsx
1575 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "") 1605 "")
1579 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1580 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1581 1617
1618 for ($xml) {
1582 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1584 1621
1585 # compress some whitespace 1622 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1590 1628
1591 $_ 1629 $xml
1592} 1630}
1593 1631
1594sub hintmode { 1632sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode} 1634 $_[0]{hintmode}
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2669 2707
2670=cut 2708=cut
2671 2709
2710# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2711our %CHANNEL = (
2673 "c/identify" => { 2712 "c/identify" => {
2674 id => "infobox", 2713 id => "infobox",
2675 title => "Identify", 2714 title => "Identify",
2676 reply => undef, 2715 reply => undef,
2680 id => "infobox", 2719 id => "infobox",
2681 title => "Examine", 2720 title => "Examine",
2682 reply => undef, 2721 reply => undef,
2683 tooltip => "Signs and other items you examined", 2722 tooltip => "Signs and other items you examined",
2684 }, 2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2685 "c/lookat" => { 2730 "c/lookat" => {
2686 id => "infobox", 2731 id => "infobox",
2687 title => "Look", 2732 title => "Look",
2688 reply => undef, 2733 reply => undef,
2689 tooltip => "What you saw there", 2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2690 }, 2759 },
2691); 2760);
2692 2761
2693sub cf::client::send_msg { 2762sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines