Commit 9159d2bb authored by argon.sun's avatar argon.sun

fix

parent 1ad1b5fc
...@@ -146,17 +146,21 @@ int ReplayMode::ReplayThread(void* param) { ...@@ -146,17 +146,21 @@ int ReplayMode::ReplayThread(void* param) {
} }
end_duel(pduel); end_duel(pduel);
if(!is_closing) { if(!is_closing) {
mainGame->stMessage->setText(dataManager.GetSysString(1501));
mainGame->actionSignal.Reset(); mainGame->actionSignal.Reset();
mainGame->gMutex.Lock();
mainGame->stMessage->setText(dataManager.GetSysString(1501));
if(mainGame->wCardSelect->isVisible()) if(mainGame->wCardSelect->isVisible())
mainGame->HideElement(mainGame->wCardSelect); mainGame->HideElement(mainGame->wCardSelect);
mainGame->PopupElement(mainGame->wMessage); mainGame->PopupElement(mainGame->wMessage);
mainGame->gMutex.Unlock();
mainGame->actionSignal.Wait(); mainGame->actionSignal.Wait();
mainGame->gMutex.Lock();
mainGame->dInfo.isStarted = false; mainGame->dInfo.isStarted = false;
mainGame->dInfo.isReplay = false; mainGame->dInfo.isReplay = false;
mainGame->CloseDuelWindow(); mainGame->CloseDuelWindow();
mainGame->ClearTextures(); mainGame->ClearTextures();
mainGame->ShowElement(mainGame->wReplay); mainGame->ShowElement(mainGame->wReplay);
mainGame->gMutex.Unlock();
mainGame->device->setEventReceiver(&mainGame->menuHandler); mainGame->device->setEventReceiver(&mainGame->menuHandler);
} }
return 0; return 0;
......
...@@ -1083,6 +1083,10 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr ...@@ -1083,6 +1083,10 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr
shuffle(0, LOCATION_DECK); shuffle(0, LOCATION_DECK);
if(core.shuffle_deck_check[1]) if(core.shuffle_deck_check[1])
shuffle(1, LOCATION_DECK); shuffle(1, LOCATION_DECK);
cost[0].count = 0;
cost[1].count = 0;
cost[0].amount = 0;
cost[1].amount = 0;
} }
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = FALSE;
return TRUE; return TRUE;
......
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