show player totals for network versions

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1109 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Modules/BZFlag.pl b/src/Modules/BZFlag.pl
index 690e7b58bc81caf9c95f0532a1ef8c4eaa1516be..b5a94d21d7ec830214db30f6e475914b383b6e6e 100755 (executable)
--- a/src/Modules/BZFlag.pl
+++ b/src/Modules/BZFlag.pl
@@ -52,7 +52,6 @@ sub list {
        my $res = $ua->request($req);
        my %servers;
        my $totalServers = 0;
-       my $totalPlayers = 0;
        for my $line (split("\n",$res->content)) {
                my ($serverport, $version, $flags, $ip, $comments) = split(" ",$line,5);
                # not "(A4)18" to handle old dumb perl
@@ -63,10 +62,11 @@ sub list {
                my $playerSize = hex($rogueSize) + hex($redSize) + hex($greenSize)
                                + hex($blueSize) + hex($purpleSize) + hex($observerSize);
                $servers{$serverport} = $playerSize;
+         $servers{$version} += $playerSize;
+               $servers{'PLAYERS'} += $playerSize;
                $totalServers += 1;
-               $totalPlayers += $playerSize;
        }
-       $response .= "s=$totalServers p=$totalPlayers";
+       $response .= "s=$totalServers";
        foreach my $key (sort {$servers{$b} <=> $servers{$a}} (keys(%servers))) {
                if ($servers{$key} > 0) {
                        $response .= " $key($servers{$key})";
@@ -165,7 +165,6 @@ sub querytext {
                # send game request
                print S1 pack("n2", 0, 0x7167);
 
-               # FIXME the packets are wrong from here down
                # get reply
                return 'server read error' unless read(S1, $buffer, 46) == 46;
     my ($infolen,$infocode,$style,$maxPlayers,$maxShots,