Skip to content

Y
ygopro-core
Commit 85c87744 authored by mercury233's avatar mercury233
Browse files
Options

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

parents 640377b9 17d9dd15
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
processor.cpp
View file @ 85c87744
...@@ -749,6 +749,7 @@ int32 field::execute_cost(uint16 step, effect * triggering_effect, uint8 trigger ...@@ -749,6 +749,7 @@ int32 field::execute_cost(uint16 step, effect * triggering_effect, uint8 trigger
core.shuffle_hand_check[0] = FALSE; core.shuffle_hand_check[0] = FALSE;
core.shuffle_hand_check[1] = FALSE; core.shuffle_hand_check[1] = FALSE;
} }
core.units.begin()->arg2 = core.shuffle_check_disabled;
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = FALSE;
core.check_level++; core.check_level++;
} }
...@@ -772,7 +773,7 @@ int32 field::execute_cost(uint16 step, effect * triggering_effect, uint8 trigger ...@@ -772,7 +773,7 @@ int32 field::execute_cost(uint16 step, effect * triggering_effect, uint8 trigger
if(core.shuffle_deck_check[1]) if(core.shuffle_deck_check[1])
shuffle(1, LOCATION_DECK); shuffle(1, LOCATION_DECK);
} }
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = core.units.begin()->arg2;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
...@@ -800,6 +801,7 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr ...@@ -800,6 +801,7 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr
core.shuffle_hand_check[0] = FALSE; core.shuffle_hand_check[0] = FALSE;
core.shuffle_hand_check[1] = FALSE; core.shuffle_hand_check[1] = FALSE;
} }
core.units.begin()->arg2 = core.shuffle_check_disabled;
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = FALSE;
core.check_level++; core.check_level++;
} }
...@@ -827,7 +829,7 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr ...@@ -827,7 +829,7 @@ int32 field::execute_operation(uint16 step, effect * triggering_effect, uint8 tr
//cost[0].amount = 0; //cost[0].amount = 0;
//cost[1].amount = 0; //cost[1].amount = 0;
} }
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = core.units.begin()->arg2;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
...@@ -856,6 +858,7 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg ...@@ -856,6 +858,7 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg
core.shuffle_hand_check[0] = FALSE; core.shuffle_hand_check[0] = FALSE;
core.shuffle_hand_check[1] = FALSE; core.shuffle_hand_check[1] = FALSE;
} }
core.units.begin()->arg2 = core.shuffle_check_disabled;
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = FALSE;
core.check_level++; core.check_level++;
} }
...@@ -879,7 +882,7 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg ...@@ -879,7 +882,7 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg
if(core.shuffle_deck_check[1]) if(core.shuffle_deck_check[1])
shuffle(1, LOCATION_DECK); shuffle(1, LOCATION_DECK);
} }
core.shuffle_check_disabled = FALSE; core.shuffle_check_disabled = core.units.begin()->arg2;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
......
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