Commit 5327cf19 authored by fallenstardust's avatar fallenstardust

fix

parent 6bacd86b
...@@ -352,7 +352,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) { ...@@ -352,7 +352,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
return false; return false;
std::stringstream deckStream; std::stringstream deckStream;
SaveDeck(deck, 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); std::fclose(fp);
return true; return true;
} }
......
...@@ -45,8 +45,7 @@ int32_t field::disable_chain(uint8_t chaincount, uint8_t forced) { ...@@ -45,8 +45,7 @@ int32_t field::disable_chain(uint8_t chaincount, uint8_t forced) {
chain& pchain = core.current_chain[chaincount - 1]; chain& pchain = core.current_chain[chaincount - 1];
card* phandler = pchain.triggering_effect->get_handler(); card* phandler = pchain.triggering_effect->get_handler();
if(!(pchain.flag & CHAIN_DISABLE_EFFECT) && is_chain_disablable(pchain.chain_count) if(!(pchain.flag & CHAIN_DISABLE_EFFECT) && is_chain_disablable(pchain.chain_count)
&& (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect)) && (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect))) {
&& !(phandler->is_has_relation(pchain) && phandler->is_status(STATUS_DISABLED) && !forced)) {
core.current_chain[chaincount - 1].flag |= CHAIN_DISABLE_EFFECT; core.current_chain[chaincount - 1].flag |= CHAIN_DISABLE_EFFECT;
core.current_chain[chaincount - 1].disable_reason = core.reason_effect; core.current_chain[chaincount - 1].disable_reason = core.reason_effect;
core.current_chain[chaincount - 1].disable_player = core.reason_player; core.current_chain[chaincount - 1].disable_player = core.reason_player;
......
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