Merge branch 'fh' into sound

gframe/game.cpp

@@ -15,7 +15,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1341;
+const unsigned short PRO_VERSION = 0x1342;
 
 namespace ygo {
 

gframe/menu_handler.cpp

@@ -257,7 +257,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				ZeroMemory(&si, sizeof(si));
 				si.cb = sizeof(si);
 				ZeroMemory(&pi, sizeof(pi));
-				wchar_t* cmd = new wchar_t[MAX_PATH];
+				wchar_t cmd[MAX_PATH];
 				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);

gframe/tag_duel.cpp

@@ -751,12 +751,12 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 		case MSG_SHUFFLE_EXTRA: {
 			player = BufferIO::ReadInt8(pbuf);
 			count = BufferIO::ReadInt8(pbuf);
-			NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, offset, (pbuf - offset) + count * 4);
-			NetServer::ReSendToPlayer(players[player * 2 + 1]);
+			NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, (pbuf - offset) + count * 4);
 			for(int i = 0; i < count; ++i)
 				BufferIO::WriteInt32(pbuf, 0);
-			for (int p = (1 - player) * 2, i = 0; i < 2; i++, p++)
-				NetServer::SendBufferToPlayer(players[p], STOC_GAME_MSG, offset, pbuf - offset);
+			for(int i = 0; i < 4; ++i)
+				if(players[i] != cur_player[player])
+					NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
 			for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 				NetServer::ReSendToPlayer(*oit);
 			RefreshExtra(player);

ocgcore @ 74247b0d

-Subproject commit 5266b8a87f0ca017388c780ee642e0dd78354018
+Subproject commit 74247b0dd884254a153062c2eada47264246cfbb

script @ 0abc46fd

-Subproject commit edc8387e017e8c366ef09a87b90e35f2db4e20e1
+Subproject commit 0abc46fdd0ec78371d79ea352eab2eb4e556cb4a

strings.conf

@@ -523,6 +523,7 @@
 !counter 0x43 缺陷指示物
 !counter 0x44 指示物（弹带城壁龙）
 !counter 0x1045 鳞粉指示物
+!counter 0x46 指示物（刚鬼死斗）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス

system.conf

 #config file
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
+use_image_scale = 1
 antialias = 2
 errorlog = 1
 nickname = Player
@@ -24,10 +25,11 @@ hide_hint_button = 1
 control_mode = 0
 draw_field_spell = 1
 separate_clear_button = 1
-#auto_search_limit >= 0: Start search automatically when the user enters N chars.
+#auto_search_limit >= 0: Start search automatically when the user enters N chars
 auto_search_limit = -1
 ignore_deck_changes = 0
 default_ot = 1
+enable_bot_mode = 0
 enable_sound = 1
 enable_music = 1
 #Volume of sound and music, between 0 and 100