Merge branch 'ai' into test

gframe/game.cpp

@@ -1030,10 +1030,10 @@ void Game::RefreshBot() {
 			if(linebuf[0] == '!') {
 				BotInfo newinfo;
 				sscanf(linebuf, "!%240[^\n]", strbuf);
-				BufferIO::DecodeUTF8(strbuf, newinfo.internalname);
+				BufferIO::DecodeUTF8(strbuf, newinfo.name);
 				fgets(linebuf, 256, fp);
 				sscanf(linebuf, "%240[^\n]", strbuf);
-				BufferIO::DecodeUTF8(strbuf, newinfo.name);
+				BufferIO::DecodeUTF8(strbuf, newinfo.command);
 				fgets(linebuf, 256, fp);
 				sscanf(linebuf, "%240[^\n]", strbuf);
 				BufferIO::DecodeUTF8(strbuf, newinfo.desc);

gframe/game.h

@@ -75,8 +75,8 @@ struct DuelInfo {
 };
 
 struct BotInfo {
-	wchar_t internalname[256];
 	wchar_t name[32];
+	wchar_t command[256];
 	wchar_t desc[256];
 	int flag;
 };

gframe/menu_handler.cpp

@@ -257,7 +257,9 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				si.cb = sizeof(si);
 				ZeroMemory(&pi, sizeof(pi));
 				LPTSTR cmd = new TCHAR[MAX_PATH];
-				myswprintf(cmd, L"Bot.exe \"%s\" %d %d", mainGame->botInfo[sel].internalname, (mainGame->chkBotHand->isChecked() ? 1 : 0), mainGame->gameConf.serverport);
+				int flag = 0;
+				flag += (mainGame->chkBotHand->isChecked() ? 0x1 : 0);
+				myswprintf(cmd, L"Bot.exe \"%ls\" %d %d", mainGame->botInfo[sel].command, flag, mainGame->gameConf.serverport);
 				if(!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
 				{
 					NetServer::StopServer();