BZFlag cleanup

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

diff --git a/files/sample/blootbot.chan b/files/sample/blootbot.chan
index 44840f99cbb9278a74f46d1457bbae0f5d276dd7..b747a0ea06585b4746f35589811ef475972e9603 100644 (file)
--- a/files/sample/blootbot.chan
+++ b/files/sample/blootbot.chan
@@ -22,7 +22,7 @@
 _default
     +allowConv
     +allowDNS
-    +bzflag
+    +BZFlag
     +chanlimitcheck
     chanlimitcheckInterval 10
     chanlimitcheckPlus 10

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index fd10ecd01b3c6a68d43514f29ff49cabeb1370c4..09cd88483aa689ab9a25cb478ceb6880d045b98a 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -232,14 +232,14 @@ sub parseCmdHook {
        'Identifier' => 'weather', 'Help' => 'weather',
        'Cmdstats' => 'weather', 'Forker' => 1) );
 &addCmdHook("extra", 'bzflist', ('CODEREF' => 'BZFlag::list',
-       'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag',
+       'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag',
        'Forker' => 1) );
 &addCmdHook("extra", 'bzflist17', ('CODEREF' => 'BZFlag::list17',
-       'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag',
+       'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag',
        'Forker' => 1) );
 &addCmdHook("extra", 'bzfquery', ('CODEREF' => 'BZFlag::query',
-       'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag',
-       'Forker' => 1, 'Help' => 'bzflag') );
+       'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag',
+       'Forker' => 1) );
 &addCmdHook("extra", 'zfi', ('CODEREF' => 'zfi::query',
        'Identifier' => 'zfi', 'Cmdstats' => 'zfi',
        'Forker' => 1) );

diff --git a/src/Modules/BZFlag.pl b/src/Modules/BZFlag.pl
index c52d07e7ba30ac705f503586d32e6aac6394265c..26ce457e3cccaed6a4d60d3110ac997333f1164e 100755 (executable)
--- a/src/Modules/BZFlag.pl
+++ b/src/Modules/BZFlag.pl
@@ -24,7 +24,7 @@ BEGIN {
        $no_BZFlag++ if ($@);
 }
 
-sub BZFlag::BZFlag {
+sub BZFlag {
        my ($message) = @_;
        my ($retval);
        if ($no_BZFlag) {
@@ -41,7 +41,7 @@ sub BZFlag::BZFlag {
        &::performStrictReply($retval);
 }
 
-sub BZFlag::list {
+sub list {
        my ($response);
        my $ua = new LWP::UserAgent;
        $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
@@ -76,7 +76,7 @@ sub BZFlag::list {
        return;
 }
 
-sub BZFlag::list17 {
+sub list17 {
        my ($response);
        my $ua = new LWP::UserAgent;
        $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
@@ -113,7 +113,7 @@ sub BZFlag::list17 {
        return;
 }
 
-sub BZFlag::querytext {
+sub querytext {
        my ($servernameport) = @_;
        my ($servername,$port) = split(":",$servernameport);
        if ($no_BZFlag) {
@@ -280,7 +280,7 @@ sub BZFlag::querytext {
        return $response;
 }
 
-sub BZFlag::query {
+sub query {
        my ($servernameport) = @_;
        &::performStrictReply(&querytext($servernameport));
        return;

diff --git a/src/modules.pl b/src/modules.pl
index 0fcf72245f025314f7d8c1d8cc0da6f5156f24e3..be65dce1fd07ce2ed72f011888a1e6f1f3a6d61b 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -24,7 +24,7 @@ if ($@) {
 %myModules = (
        "babelfish"     => "babel.pl",
        "botmail"       => "botmail.pl",
-       "bzflag"        => "BZFlag.pl",
+       "BZFlag"        => "BZFlag.pl",
        "countdown"     => "Countdown.pl",
        "debian"        => "Debian.pl",
        "debianExtra"   => "DebianExtra.pl",