Skip to content

Y
ygopro-core
Commit 41856cdc authored by nanahira's avatar nanahira
Browse files
Options

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

parents 338c4e1c 28d954ee
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
operations.cpp
View file @ 41856cdc
......@@ -6094,7 +6094,8 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event();
} else {
solve_continuous(peffect->get_handler_player(), peffect, e);
core.units.begin()->step = 1;
//call Duel.SetCoinResult in operation if necessary
return TRUE;
}
return FALSE;
}
......@@ -6103,11 +6104,6 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event();
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;
}
......@@ -6155,7 +6151,8 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event();
} else {
solve_continuous(peffect->get_handler_player(), peffect, e);
core.units.begin()->step = 1;
//call Duel.SetDiceResult in operation if necessary
return TRUE;
}
return FALSE;
}
......@@ -6164,11 +6161,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
process_instant_event();
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;
}
......
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