Skip to content

Y
ygopro
Commit 058b3afa authored by mercury233's avatar mercury233
Browse files
Options

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

parents aadb2ecf b68249ed
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
gframe/duelclient.cpp
View file @ 058b3afa
...@@ -1760,10 +1760,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1760,10 +1760,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
respbuf[0] = mainGame->LocalPlayer(0); respbuf[0] = mainGame->LocalPlayer(0);
respbuf[1] = LOCATION_MZONE; respbuf[1] = LOCATION_MZONE;
filter = mainGame->dField.selectable_field & 0x7f; filter = mainGame->dField.selectable_field & 0x7f;
} else if (mainGame->dField.selectable_field & 0x1f00) { } else if (mainGame->dField.selectable_field & 0x3f00) {
respbuf[0] = mainGame->LocalPlayer(0); respbuf[0] = mainGame->LocalPlayer(0);
respbuf[1] = LOCATION_SZONE; respbuf[1] = LOCATION_SZONE;
filter = (mainGame->dField.selectable_field >> 8) & 0x1f; filter = (mainGame->dField.selectable_field >> 8) & 0x3f;
} else if (mainGame->dField.selectable_field & 0xc000) { } else if (mainGame->dField.selectable_field & 0xc000) {
respbuf[0] = mainGame->LocalPlayer(0); respbuf[0] = mainGame->LocalPlayer(0);
respbuf[1] = LOCATION_SZONE; respbuf[1] = LOCATION_SZONE;
...@@ -1773,10 +1773,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1773,10 +1773,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
respbuf[0] = mainGame->LocalPlayer(1); respbuf[0] = mainGame->LocalPlayer(1);
respbuf[1] = LOCATION_MZONE; respbuf[1] = LOCATION_MZONE;
filter = (mainGame->dField.selectable_field >> 16) & 0x7f; filter = (mainGame->dField.selectable_field >> 16) & 0x7f;
} else if (mainGame->dField.selectable_field & 0x1f000000) { } else if (mainGame->dField.selectable_field & 0x3f000000) {
respbuf[0] = mainGame->LocalPlayer(1); respbuf[0] = mainGame->LocalPlayer(1);
respbuf[1] = LOCATION_SZONE; respbuf[1] = LOCATION_SZONE;
filter = (mainGame->dField.selectable_field >> 24) & 0x1f; filter = (mainGame->dField.selectable_field >> 24) & 0x3f;
} else { } else {
respbuf[0] = mainGame->LocalPlayer(1); respbuf[0] = mainGame->LocalPlayer(1);
respbuf[1] = LOCATION_SZONE; respbuf[1] = LOCATION_SZONE;
...@@ -2511,6 +2511,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2511,6 +2511,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
else if(reason & REASON_DESTROY && pl != cl) else if(reason & REASON_DESTROY && pl != cl)
soundManager.PlaySoundEffect(SOUND_DESTROYED); soundManager.PlaySoundEffect(SOUND_DESTROYED);
} }
int appear = mainGame->gameConf.quick_animation ? 12 : 20;
if (pl == 0) { if (pl == 0) {
ClientCard* pcard = new ClientCard(); ClientCard* pcard = new ClientCard();
pcard->position = cp; pcard->position = cp;
...@@ -2521,8 +2522,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2521,8 +2522,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
mainGame->dField.GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true); mainGame->dField.GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
pcard->curAlpha = 5; pcard->curAlpha = 5;
mainGame->dField.FadeCard(pcard, 255, 20); mainGame->dField.FadeCard(pcard, 255, appear);
mainGame->WaitFrameSignal(20); mainGame->WaitFrameSignal(appear);
} else } else
mainGame->dField.AddCard(pcard, cc, cl, cs); mainGame->dField.AddCard(pcard, cc, cl, cs);
} else if (cl == 0) { } else if (cl == 0) {
...@@ -2533,8 +2534,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2533,8 +2534,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
for(auto eqit = pcard->equipped.begin(); eqit != pcard->equipped.end(); ++eqit) for(auto eqit = pcard->equipped.begin(); eqit != pcard->equipped.end(); ++eqit)
(*eqit)->equipTarget = 0; (*eqit)->equipTarget = 0;
if(!mainGame->dInfo.isReplay || !mainGame->dInfo.isReplaySkiping) { if(!mainGame->dInfo.isReplay || !mainGame->dInfo.isReplaySkiping) {
mainGame->dField.FadeCard(pcard, 5, 20); mainGame->dField.FadeCard(pcard, 5, appear);
mainGame->WaitFrameSignal(20); mainGame->WaitFrameSignal(appear);
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->dField.RemoveCard(pc, pl, ps); mainGame->dField.RemoveCard(pc, pl, ps);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
......
strings.conf
View file @ 058b3afa
...@@ -1161,3 +1161,4 @@ ...@@ -1161,3 +1161,4 @@
!setname 0x18b 救援ACE队 R－ACE !setname 0x18b 救援ACE队 R－ACE
!setname 0x18c 纯爱妖精 ピュアリィ !setname 0x18c 纯爱妖精 ピュアリィ
!setname 0x18d 御巫 !setname 0x18d 御巫
!setname 0x18e 仪水镜 儀水鏡
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