Skip to content

Y
ygopro
Commit 77239b7e authored by salix5's avatar salix5
Browse files
Options

fix processor

parent ec3b62b1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
ocgcore/processor.cpp
View file @ 77239b7e
...@@ -3465,6 +3465,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3465,6 +3465,7 @@ int32 field::process_battle_command(uint16 step) {
case 26: { case 26: {
uint32 aa = core.attacker->get_attack(), ad = core.attacker->get_defence(); uint32 aa = core.attacker->get_attack(), ad = core.attacker->get_defence();
uint32 da = 0, dd = 0; uint32 da = 0, dd = 0;
uint8 pa = core.attacker->current.controler, pd;
core.attacker->q_cache.attack = aa; core.attacker->q_cache.attack = aa;
core.attacker->q_cache.defence = ad; core.attacker->q_cache.defence = ad;
core.attacker->set_status(STATUS_BATTLE_DESTROYED, FALSE); core.attacker->set_status(STATUS_BATTLE_DESTROYED, FALSE);
...@@ -3474,6 +3475,11 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3474,6 +3475,11 @@ int32 field::process_battle_command(uint16 step) {
core.attack_target->q_cache.attack = da; core.attack_target->q_cache.attack = da;
core.attack_target->q_cache.defence = dd; core.attack_target->q_cache.defence = dd;
core.attack_target->set_status(STATUS_BATTLE_DESTROYED, FALSE); core.attack_target->set_status(STATUS_BATTLE_DESTROYED, FALSE);
pd = core.attack_target->current.controler;
if(pa != pd){
core.attacker->set_status(STATUS_OPPO_BATTLE, TRUE);
core.attack_target->set_status(STATUS_OPPO_BATTLE, TRUE);
}
} }
effect* damchange = 0; effect* damchange = 0;
card* reason_card = 0; card* reason_card = 0;
...@@ -4136,6 +4142,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) { ...@@ -4136,6 +4142,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
} }
case 3: { case 3: {
//Standby Phase //Standby Phase
shuffle(turn_player, LOCATION_HAND);
infos.phase = PHASE_STANDBY; infos.phase = PHASE_STANDBY;
core.phase_action = FALSE; core.phase_action = FALSE;
raise_event((card*)0, EVENT_PHASE_PRESTART + PHASE_STANDBY, 0, 0, 0, turn_player, 0); raise_event((card*)0, EVENT_PHASE_PRESTART + PHASE_STANDBY, 0, 0, 0, turn_player, 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