Commit 1251ab35 authored by mercury233's avatar mercury233

Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

parents ce9cfe29 488e66c5
......@@ -352,7 +352,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
return false;
std::stringstream deckStream;
SaveDeck(deck, deckStream);
std::fwrite(deckStream.str().c_str(), 1, deckStream.str().length(), fp);
std::fputs(deckStream.str().c_str(), fp);
std::fclose(fp);
return true;
}
......
......@@ -2912,6 +2912,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
else
soundManager.PlaySoundEffect(SOUND_SPECIAL_SUMMON);
myswprintf(event_string, dataManager.GetSysString(1605), dataManager.GetName(code));
if(code) {
mainGame->showcardcode = code;
mainGame->showcarddif = 1;
mainGame->showcard = 5;
......@@ -2919,6 +2920,7 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
mainGame->showcard = 0;
mainGame->WaitFrameSignal(11);
}
}
return true;
}
case MSG_SPSUMMONED: {
......
......@@ -1302,9 +1302,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break;
}
case MSG_SPSUMMONING: {
pbufw = pbuf;
int cc = pbuf[4];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int cp = pbuf[7];
pbuf += 8;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]);
NetServer::SendBufferToPlayer(players[cc], STOC_GAME_MSG, offset, pbuf - offset);
if (cp & POS_FACEDOWN)
BufferIO::Write<int32_t>(pbufw, 0);
NetServer::SendBufferToPlayer(players[1 - cc], STOC_GAME_MSG, offset, pbuf - offset);
for(auto oit = observers.begin(); oit != observers.end(); ++oit)
NetServer::ReSendToPlayer(*oit);
#ifdef YGOPRO_SERVER_MODE
......
......@@ -1294,11 +1294,20 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break;
}
case MSG_SPSUMMONING: {
pbufw = pbuf;
int cc = pbuf[4];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int cp = pbuf[7];
pbuf += 8;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]);
NetServer::ReSendToPlayer(players[3]);
auto pid = (cc == 0) ? 0 : 2;
NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[pid + 1]);
if (cp & POS_FACEDOWN)
BufferIO::Write<int32_t>(pbufw, 0);
pid = 2 - pid;
NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[pid + 1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit)
NetServer::ReSendToPlayer(*oit);
#ifdef YGOPRO_SERVER_MODE
......
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