r5471 - trunk/Docs/server/rcon2irc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-09 09:14:47 -0500 (Fri, 09 Jan 2009)
New Revision: 5471

Modified:
   trunk/Docs/server/rcon2irc/rbiserver.pl
   trunk/Docs/server/rcon2irc/rcon2irc.pl
Log:
rcon2irc status command fix


Modified: trunk/Docs/server/rcon2irc/rbiserver.pl
===================================================================
--- trunk/Docs/server/rcon2irc/rbiserver.pl	2009-01-09 13:50:26 UTC (rev 5470)
+++ trunk/Docs/server/rcon2irc/rbiserver.pl	2009-01-09 14:14:47 UTC (rev 5471)
@@ -82,14 +82,14 @@
 } ],
 [ dp => q{:recordset:(\d+):.*} => sub {
 	my ($id) = @_;
-	my $ip = $store{"playerip_$id"};
-	my $slot = $store{"playerslot_$id"};
+	my $ip = $store{"playerip_byid_$id"};
+	my $slot = $store{"playerslot_byid_$id"};
 	my $name = $config{irc_nick};
 	$name =~ s/Nex//; # haggerNexCTF -> haggerCTF
 	my $map = $store{map};
 	$map =~ s/^[a-z]*_//;
 	$ip =~ s/\./-/g;
-	my $pattern = "/nexuiz/data/home/.nexuiz/extramaps-$name/sv_autodemos/????-??-??_??-??_${map}_${slot}_${ip}-*.dem";
+	my $pattern = "/nexuiz/data/home-$name/data/sv_autodemos/????-??-??_??-??_${map}_${slot}_${ip}-*.dem";
 	if(my @result = glob $pattern)
 	{
 		for(@result)

Modified: trunk/Docs/server/rcon2irc/rcon2irc.pl
===================================================================
--- trunk/Docs/server/rcon2irc/rcon2irc.pl	2009-01-09 13:50:26 UTC (rev 5470)
+++ trunk/Docs/server/rcon2irc/rcon2irc.pl	2009-01-09 14:14:47 UTC (rev 5471)
@@ -631,7 +631,7 @@
 our %channels = ();
 our %store = (
 	irc_nick => "",
-	playernick_0 => "(console)",
+	playernick_byid_0 => "(console)",
 );
 our %config = (
 	irc_server => undef,
@@ -1228,9 +1228,10 @@
 	[ dp => q{:join:(\d+):(\d+):([^:]*):(.*)} => sub {
 		my ($id, $slot, $ip, $nick) = @_;
 		$nick = color_dp2irc $nick;
-		$store{"playernick_$id"} = $nick;
-		$store{"playerslot_$id"} = $slot;
-		$store{"playerip_$id"} = $ip;
+		$store{"playernick_byid_$id"} = $nick;
+		$store{"playerip_byid_$id"} = $ip;
+		$store{"playerslot_byid_$id"} = $slot;
+		$store{"playerid_byslot_$slot"} = $id;
 		return 0;
 	} ],
 
@@ -1240,7 +1241,7 @@
 		$nick = color_dp2irc $nick;
 		my $oldnick = $store{"playernick_$id"};
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 is now known as $nick";
-		$store{"playernick_$id"} = $nick;
+		$store{"playernick_byid_$id"} = $nick;
 		return 0;
 	} ],
 
@@ -1248,7 +1249,7 @@
 	[ dp => q{:vote:vcall:(\d+):(.*)} => sub {
 		my ($id, $command) = @_;
 		$command = color_dp2irc $command;
-		my $oldnick = $id ? $store{"playernick_$id"} : "(console)";
+		my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 calls a vote for \"$command\017\"";
 		return 0;
 	} ],
@@ -1256,7 +1257,7 @@
 	# chat: Nexuiz server -> IRC channel, vote stop
 	[ dp => q{:vote:vstop:(\d+)} => sub {
 		my ($id) = @_;
-		my $oldnick = $id ? $store{"playernick_$id"} : "(console)";
+		my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 stopped the vote";
 		return 0;
 	} ],
@@ -1264,7 +1265,7 @@
 	# chat: Nexuiz server -> IRC channel, master login
 	[ dp => q{:vote:vlogin:(\d+)} => sub {
 		my ($id) = @_;
-		my $oldnick = $id ? $store{"playernick_$id"} : "(console)";
+		my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 logged in as master";
 		return 0;
 	} ],
@@ -1273,7 +1274,7 @@
 	[ dp => q{:vote:vdo:(\d+):(.*)} => sub {
 		my ($id, $command) = @_;
 		$command = color_dp2irc $command;
-		my $oldnick = $id ? $store{"playernick_$id"} : "(console)";
+		my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 used his master status to do \"$command\017\"";
 		return 0;
 	} ],