read the config file on the command line

fixed a typo in the admin game welcome message
added responses for !disable and !enable
updated version to 10.3

Author: hogantp

BNCSutil.dll

@@ -782,7 +782,10 @@ void CBNET :: ProcessChatEvent( CIncomingChatEvent *chatEvent )
 				if( Command == "disable" )
 				{
 					if( IsRootAdmin( User ) )
+					{
+						QueueChatCommand( m_GHost->m_Language->BotDisabled( ), User, Whisper );
 						m_GHost->m_Enabled = false;
+					}
 					else
 						QueueChatCommand( m_GHost->m_Language->YouDontHaveAccessToThatCommand( ), User, Whisper );
 				}
@@ -794,7 +797,10 @@ void CBNET :: ProcessChatEvent( CIncomingChatEvent *chatEvent )
 				if( Command == "enable" )
 				{
 					if( IsRootAdmin( User ) )
+					{
+						QueueChatCommand( m_GHost->m_Language->BotEnabled( ), User, Whisper );
 						m_GHost->m_Enabled = true;
+					}
 					else
 						QueueChatCommand( m_GHost->m_Language->YouDontHaveAccessToThatCommand( ), User, Whisper );
 				}

ghost.exe

@@ -3291,7 +3291,7 @@ void CAdminGame :: SendWelcomeMessage( CGamePlayer *player )
 	SendChat( player, "Commands: addadmin, checkadmin, countadmins, deladmin" );
 	SendChat( player, "Commands: disable, enable, end, exit, getgame, getgames" );
 	SendChat( player, "Commands: load, map, password, priv, privby, pub, pubby" );
-	SendChat( player, "Commands: saygames, quit, unhost" );
+	SendChat( player, "Commands: quit, saygames, unhost" );
 }
 
 void CAdminGame :: EventPlayerJoined( CPotentialPlayer *player, CIncomingJoinPlayer *joinPlayer )
@@ -3482,14 +3482,20 @@ void CAdminGame :: EventPlayerBotCommand( CGamePlayer *player, string command, s
 		//
 
 		if( Command == "disable" )
+		{
+			SendChat( player, m_GHost->m_Language->BotDisabled( ) );
 			m_GHost->m_Enabled = false;
+		}
 
 		//
 		// !ENABLE
 		//
 
 		if( Command == "enable" )
+		{
+			SendChat( player, m_GHost->m_Language->BotEnabled( ) );
 			m_GHost->m_Enabled = true;
+		}
 
 		//
 		// !END

ghost/bnet.cpp

@@ -120,14 +120,21 @@ void SignalCatcher( int signal )
 // main
 //
 
-int main( void )
+int main( int argc, char **argv )
 {
+	string CFGFile = "ghost.cfg";
+
+	if( argc > 1 && argv[1] )
+		CFGFile = argv[1];
+
 	// read config file
 
 	CConfig CFG;
-	CFG.Read( "ghost.cfg" );
+	CFG.Read( CFGFile );
 	gLogFile = CFG.GetString( "bot_log", "ghost.log" );
 
+	// print something for logging purposes
+
 	CONSOLE_Print( "[GHOST] starting up" );
 
 	// catch SIGABRT and SIGINT
@@ -241,7 +248,7 @@ CGHost :: CGHost( CConfig *CFG )
 	m_Language = new CLanguage( );
 	m_Exiting = false;
 	m_Enabled = true;
-	m_Version = "10.2";
+	m_Version = "10.3";
 	m_HostCounter = 1;
 	m_Warcraft3Path = CFG->GetString( "bot_war3path", "C:\\Program Files\\Warcraft III\\" );
 	m_HostPort = CFG->GetInt( "bot_hostport", 6112 );

ghost/game.cpp

@@ -931,3 +931,13 @@ string CLanguage :: UnableToCreateGameDisabled( string gamename )
 	Replace( Out, "$GAMENAME$", gamename );
 	return Out;
 }
+
+string CLanguage :: BotDisabled( )
+{
+	return m_CFG->GetString( "lang_0126", "lang_0126" );
+}
+
+string CLanguage :: BotEnabled( )
+{
+	return m_CFG->GetString( "lang_0127", "lang_0127" );
+}

ghost/ghost.cpp

@@ -161,6 +161,8 @@ class CLanguage
 	string UnableToCheckPlayerFoundMoreThanOneMatch( string victim );
 	string TheGameIsLockedBNET( );
 	string UnableToCreateGameDisabled( string gamename );
+	string BotDisabled( );
+	string BotEnabled( );
 };
 
 #endif

ghost/language.cpp

@@ -127,3 +127,5 @@ lang_0122 = Checked player [$VICTIM$]. Admin: $ADMIN$, Owner: $OWNER$, Spoof Che
 lang_0123 = Unable to check player [$VICTIM$]. Found more than one match.
 lang_0124 = This command is disabled while the game is locked.
 lang_0125 = Unable to create game [$GAMENAME$]. The bot is disabled.
+lang_0126 = Creation of new games has been disabled (if there is a game in the lobby it will not be automatically unhosted).
+lang_0127 = Creation of new games has been enabled.

ghost/language.h

@@ -1,5 +1,5 @@
 ====================
-GHost++ Version 10.2
+GHost++ Version 10.3
 ====================
 
 GHost++ is a port of the original GHost project to C++ (ported by Trevor Hogan).
@@ -225,8 +225,12 @@ In battle.net (via local chat or whisper at any time):
 !countbans              display the total number of bans for this realm
 !deladmin <name>        remove an admin from the database for this realm
 !delban <name>          remove a ban from the database for this realm
+!disable                disable creation of new games
+!enable                 enable creation of new games
 !end <number>           end a game in progress (disconnect everyone)
 !exit [force]           shutdown ghost++, optionally add [force] to skip checks
+!getclan                refresh the internal copy of the clan members list
+!getfriends             refresh the internal copy of the friends list
 !getgame <number>       display information on a game in progress
 !getgames               display information on all games
 !hold <name> ...        hold a slot for someone
@@ -240,6 +244,7 @@ In battle.net (via local chat or whisper at any time):
 !pubby <owner> <name>   host public game by another player (gives <owner> access to admin commands in the game lobby and in the game)
 !quit [force]           alias to !exit
 !say <text>             send <text> to battle.net as a chat command
+!saygames <text>        send <text> to all games
 !sp                     shuffle players
 !start [force]          start game, optionally add [force] to skip checks
 !stats [name]           display basic player statistics, optionally add [name] to display statistics for another player (can be used by non admins)
@@ -292,6 +297,7 @@ In game:
 
 !addban <name> <reason> add a new ban to the database (it tries to do a partial match)
 !ban                    alias to !addban
+!banlast <reason>       ban the last leaver
 !check <name>           check a user's status (leave blank to check your own status)
 !checkban <name>        check if a user is banned on any realm
 !drop                   drop all lagging players
@@ -314,6 +320,8 @@ In admin game lobby:
 !checkadmin <name> <realm> check if a user is an admin for the specified realm (if only one realm is defined in ghost.cfg it uses that realm instead)
 !countadmins <realm>       display the total number of admins for the specified realm (if only one realm is defined in ghost.cfg it uses that realm instead)
 !deladmin <name> <realm>   remove an admin from the database for the specified realm (if only one realm is defined in ghost.cfg it uses that realm instead)
+!disable                   disable creation of new games
+!enable                    enable creation of new games
 !end <number>              end a game in progress (disconnect everyone)
 !exit [force]              shutdown ghost++, optionally add [force] to skip checks
 !getgame <number>          display information on a game in progress
@@ -326,6 +334,7 @@ In admin game lobby:
 !pub <name>                host public game
 !pubby <owner> <name>      host public game by another player (gives <owner> access to admin commands in the game lobby and in the game)
 !quit [force]              alias to !exit
+!saygames <text>           send <text> to all games
 !unhost                    unhost game
 
 ============================
@@ -392,6 +401,26 @@ GHost++ searches for "storm.dll" in all lowercase not "Storm.dll" so you may nee
 CHANGELOG
 =========
 
+Version 10.3
+ - added support for specifying the config file on the command line (e.g. "ghost.exe mycfg.cfg" or "ghost++ mycfg.cfg")
+  * it will default to ghost.cfg if no config file is specified
+ - added support for logging console output
+ - added new config value bot_log to specify the log file
+ - added new config value bot_autolock to automatically lock the game when the owner joins
+ - added new config value bnet*_holdfriends to automatically add the bot's friends to the reserved list when creating a game
+ - added new config value bnet*_holdclan to automatically add the bot's clan members to the reserved list when creating a game
+ - added new command !banlast to ban the last leaver
+ - added new command !getclan to refresh the clan members list
+ - added new command !getfriends to refresh the friends list
+ - added new command !disable to prevent new games from being created
+ - added new command !enable to allow new games to be created
+ - added new command !saygames to send a chat message to all games
+ - fixed a bug where Warcraft 3 would crash when sharing control of units when the map has 12 slots and when connecting via LAN
+ - fixed some bugs where long chat messages would be incorrectly truncated
+ - fixed a crash bug when there was an error opening the sqlite3 database
+ - fixed a potential crash bug when checking game player summaries with a corrupt database
+ - added 3 new entries to language.cfg
+
 Version 10.2
  - added new command !closeall to close all open slots
  - added new command !openall to open all closed slots