Skip to content

Y
ygopro-core
Commit 28d954ee authored by DailyShana's avatar DailyShana
Browse files
Options

revert using return value to set coin/dice result

parent f9004164
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
operations.cpp
View file @ 28d954ee
...@@ -6033,7 +6033,8 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -6033,7 +6033,8 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event(); process_instant_event();
} else { } else {
solve_continuous(peffect->get_handler_player(), peffect, e); solve_continuous(peffect->get_handler_player(), peffect, e);
core.units.begin()->step = 1; //call Duel.SetCoinResult in operation if necessary
return TRUE;
} }
return FALSE; return FALSE;
} }
...@@ -6042,11 +6043,6 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -6042,11 +6043,6 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event(); process_instant_event();
return TRUE; return TRUE;
} }
case 2: {
for(uint8 i = 0; i < 5; ++i)
core.coin_result[i] = (returns.ivalue[0] >> (i * 4)) & 0xf;
return TRUE;
}
} }
return TRUE; return TRUE;
} }
...@@ -6094,7 +6090,8 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -6094,7 +6090,8 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event(); process_instant_event();
} else { } else {
solve_continuous(peffect->get_handler_player(), peffect, e); solve_continuous(peffect->get_handler_player(), peffect, e);
core.units.begin()->step = 1; //call Duel.SetDiceResult in operation if necessary
return TRUE;
} }
return FALSE; return FALSE;
} }
...@@ -6103,11 +6100,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -6103,11 +6100,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event(); process_instant_event();
return TRUE; return TRUE;
} }
case 2: {
for(uint8 i = 0; i < 5; ++i)
core.dice_result[i] = (returns.ivalue[0] >> (i * 4)) & 0xf;
return TRUE;
}
} }
return TRUE; return TRUE;
} }
......
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