Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro-core
Commits
304fac05
Commit
304fac05
authored
Feb 01, 2020
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify processing delayed quick effect
parent
fa41db16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
field.h
field.h
+0
-1
processor.cpp
processor.cpp
+3
-7
No files found.
field.h
View file @
304fac05
...
...
@@ -209,7 +209,6 @@ struct processor {
chain_list
new_ochain_h
;
chain_list
new_chains
;
delayed_effect_collection
delayed_quick_tmp
;
delayed_effect_collection
delayed_quick_break
;
delayed_effect_collection
delayed_quick
;
instant_f_list
quick_f_chain
;
card_set
leave_confirmed
;
...
...
processor.cpp
View file @
304fac05
...
...
@@ -1282,7 +1282,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
core
.
new_ochain_s
.
splice
(
core
.
new_ochain_s
.
begin
(),
core
.
new_ochain
);
core
.
full_event
.
splice
(
core
.
full_event
.
end
(),
core
.
delayed_activate_event
);
core
.
delayed_quick
.
clear
();
core
.
delayed_quick_
break
.
swap
(
core
.
delayed_quick
);
core
.
delayed_quick_
tmp
.
swap
(
core
.
delayed_quick
);
core
.
current_player
=
infos
.
turn_player
;
core
.
units
.
begin
()
->
step
=
1
;
return
FALSE
;
...
...
@@ -1466,6 +1466,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
case
10
:
{
core
.
new_ochain_h
.
clear
();
core
.
full_event
.
clear
();
core
.
delayed_quick
.
clear
();
for
(
auto
&
ch_lim
:
core
.
chain_limit
)
luaL_unref
(
pduel
->
lua
->
lua_state
,
LUA_REGISTRYINDEX
,
ch_lim
.
function
);
core
.
chain_limit
.
clear
();
...
...
@@ -1631,7 +1632,7 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
effect
*
peffect
=
eit
->
second
;
++
eit
;
peffect
->
set_activate_location
();
if
(
peffect
->
is_chainable
(
priority
)
&&
peffect
->
is_activateable
(
priority
,
ev
))
{
if
(
!
peffect
->
is_flag
(
EFFECT_FLAG_DELAY
)
&&
peffect
->
is_chainable
(
priority
)
&&
peffect
->
is_activateable
(
priority
,
ev
))
{
card
*
phandler
=
peffect
->
get_handler
();
newchain
.
flag
=
0
;
newchain
.
chain_id
=
infos
.
field_id
++
;
...
...
@@ -1641,8 +1642,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
newchain
.
triggering_player
=
priority
;
core
.
select_chains
.
push_back
(
newchain
);
}
core
.
delayed_quick_tmp
.
erase
(
std
::
make_pair
(
peffect
,
ev
));
core
.
delayed_quick_break
.
erase
(
std
::
make_pair
(
peffect
,
ev
));
}
}
}
...
...
@@ -1763,7 +1762,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
else
{
core
.
hint_timing
[
0
]
&=
TIMING_DAMAGE_STEP
|
TIMING_DAMAGE_CAL
;
core
.
hint_timing
[
1
]
&=
TIMING_DAMAGE_STEP
|
TIMING_DAMAGE_CAL
;
core
.
delayed_quick
.
clear
();
}
}
core
.
select_chains
.
clear
();
...
...
@@ -4544,8 +4542,6 @@ int32 field::break_effect() {
core
.
new_ochain
.
erase
(
rm
);
}
}
core
.
delayed_quick_break
.
insert
(
core
.
delayed_quick_tmp
.
begin
(),
core
.
delayed_quick_tmp
.
end
());
core
.
delayed_quick_tmp
.
clear
();
core
.
used_event
.
splice
(
core
.
used_event
.
end
(),
core
.
instant_event
);
adjust_instant
();
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment