Commit f0465ed2 authored by edo9300's avatar edo9300

Updated rock paper scissors

parent 73145d73
...@@ -3117,10 +3117,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -3117,10 +3117,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
return false; return false;
} }
case MSG_HAND_RES: { case MSG_HAND_RES: {
int res1 = BufferIO::ReadInt8(pbuf); int res = BufferIO::ReadInt8(pbuf);
int res2 = BufferIO::ReadInt8(pbuf);
mainGame->stHintMsg->setVisible(false); mainGame->stHintMsg->setVisible(false);
mainGame->showcardcode = (res1 - 1) + ((res2 - 1) << 16); mainGame->showcardcode = ((res & 0x3) - 1) + ((((res >> 2) & 0x3) - 1) << 16);
mainGame->showcarddif = 50; mainGame->showcarddif = 50;
mainGame->showcardp = 0; mainGame->showcardp = 0;
mainGame->showcard = 100; mainGame->showcard = 100;
......
...@@ -1345,7 +1345,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1345,7 +1345,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
return 1; return 1;
} }
case MSG_HAND_RES: { case MSG_HAND_RES: {
pbuf += 2; pbuf += 1;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for (auto oit = observers.begin(); oit != observers.end(); ++oit) for (auto oit = observers.begin(); oit != observers.end(); ++oit)
......
...@@ -592,7 +592,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) { ...@@ -592,7 +592,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
break; break;
} }
case MSG_HAND_RES: { case MSG_HAND_RES: {
pbuf += 2; pbuf += 1;
DuelClient::ClientAnalyze(offset, pbuf - offset); DuelClient::ClientAnalyze(offset, pbuf - offset);
break; break;
} }
......
...@@ -1390,7 +1390,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1390,7 +1390,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
return 1; return 1;
} }
case MSG_HAND_RES: { case MSG_HAND_RES: {
pbuf += 2; pbuf += 1;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[2]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment