Commit 071a5d40 authored by salix5's avatar salix5

remove GLOBALFLAG_DELAYED_QUICKEFFECT

parent 95bc5de8
...@@ -591,7 +591,7 @@ public: ...@@ -591,7 +591,7 @@ public:
#define GLOBALFLAG_DECK_REVERSE_CHECK 0x1 #define GLOBALFLAG_DECK_REVERSE_CHECK 0x1
#define GLOBALFLAG_BRAINWASHING_CHECK 0x2 #define GLOBALFLAG_BRAINWASHING_CHECK 0x2
#define GLOBALFLAG_SCRAP_CHIMERA 0x4 #define GLOBALFLAG_SCRAP_CHIMERA 0x4
#define GLOBALFLAG_DELAYED_QUICKEFFECT 0x8 //#define GLOBALFLAG_DELAYED_QUICKEFFECT 0x8
#define GLOBALFLAG_DETACH_EVENT 0x10 #define GLOBALFLAG_DETACH_EVENT 0x10
#define GLOBALFLAG_MUST_BE_SMATERIAL 0x20 #define GLOBALFLAG_MUST_BE_SMATERIAL 0x20
#define GLOBALFLAG_SPSUMMON_COUNT 0x40 #define GLOBALFLAG_SPSUMMON_COUNT 0x40
......
...@@ -2088,7 +2088,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2088,7 +2088,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
if(act) if(act)
core.select_chains.push_back(*clit); core.select_chains.push_back(*clit);
} }
if(core.global_flag & GLOBALFLAG_DELAYED_QUICKEFFECT) {
for(auto eit = core.delayed_quick.begin(); eit != core.delayed_quick.end(); ++eit) { for(auto eit = core.delayed_quick.begin(); eit != core.delayed_quick.end(); ++eit) {
peffect = eit->first; peffect = eit->first;
peffect->s_range = peffect->handler->current.location; peffect->s_range = peffect->handler->current.location;
...@@ -2106,7 +2105,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2106,7 +2105,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
} }
} }
}
core.spe_effect[priority] = core.select_chains.size(); core.spe_effect[priority] = core.select_chains.size();
if(!skip_freechain) { if(!skip_freechain) {
nil_event.event_code = EVENT_FREE_CHAIN; nil_event.event_code = EVENT_FREE_CHAIN;
...@@ -2296,8 +2294,6 @@ int32 field::process_instant_event() { ...@@ -2296,8 +2294,6 @@ int32 field::process_instant_event() {
peffect->handler->create_relation(newchain); peffect->handler->create_relation(newchain);
} }
} }
if(!(core.global_flag & GLOBALFLAG_DELAYED_QUICKEFFECT))
continue;
//delayed quick effect //delayed quick effect
pr = effects.activate_effect.equal_range(elit->event_code); pr = effects.activate_effect.equal_range(elit->event_code);
for(; pr.first != pr.second; ++pr.first) { for(; pr.first != pr.second; ++pr.first) {
...@@ -4786,10 +4782,8 @@ int32 field::break_effect() { ...@@ -4786,10 +4782,8 @@ int32 field::break_effect() {
core.new_ochain.erase(rm); core.new_ochain.erase(rm);
} }
} }
if(core.global_flag & GLOBALFLAG_DELAYED_QUICKEFFECT) {
core.delayed_quick_break.insert(core.delayed_quick_tmp.begin(), core.delayed_quick_tmp.end()); core.delayed_quick_break.insert(core.delayed_quick_tmp.begin(), core.delayed_quick_tmp.end());
core.delayed_quick_tmp.clear(); core.delayed_quick_tmp.clear();
}
core.used_event.splice(core.used_event.end(), core.instant_event); core.used_event.splice(core.used_event.end(), core.instant_event);
adjust_instant(); adjust_instant();
return 0; return 0;
......
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