Merge branch 'master' of ../ygopro-7210srv

appveyor.yml

@@ -16,9 +16,9 @@ install:
   - tar xf lua-5.3.4.tar.gz
   - move lua-5.3.4\src lua
   
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/2016/sqlite-amalgamation-3150200.zip ; exit 0"
-  - 7z x sqlite-amalgamation-3150200.zip
-  - move sqlite-amalgamation-3150200 sqlite3
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/2016/sqlite-amalgamation-3210000.zip ; exit 0"
+  - 7z x sqlite-amalgamation-3210000.zip
+  - move sqlite-amalgamation-3210000 sqlite3
   
   - appveyor DownloadFile https://github.com/tronkko/dirent/raw/master/include/dirent.h
   - move dirent.h gframe\
@@ -124,9 +124,8 @@ cache:
   - freetype-2.8.tar.bz2
   - irrlicht-1.8.4.zip
   - lua-5.3.4.tar.gz
-  - sqlite-amalgamation-3200100.zip
+  - sqlite-amalgamation-3210000.zip
   - irrKlang-32bit-1.5.0.zip
-  - sqlite-amalgamation-3150200.zip
   - premake-5.0.0-alpha10-windows.zip
   - Redis-x64-3.2.100.zip
 

gframe/game.cpp

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

gframe/tag_duel.cpp

@@ -941,12 +941,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);