Skip to content

Y
ygopro-core
Commit 4d95c45d authored by nanahira's avatar nanahira Committed by GitHub
Browse files
Options

revert coin_count type 

Co-authored-by: salix5's avatarsalix5 <salix5566@gmail.com>
parent 542684f0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
field.h
View file @ 4d95c45d
...@@ -312,7 +312,7 @@ struct processor { ...@@ -312,7 +312,7 @@ struct processor {
uint8_t set_group_seq[7]{}; uint8_t set_group_seq[7]{};
uint8_t dice_result[5]{}; uint8_t dice_result[5]{};
uint32_t coin_result{ 0 }; uint32_t coin_result{ 0 };
uint8_t coin_count{ 0 }; int32_t coin_count{ 0 };
bool is_target_ready{ false }; bool is_target_ready{ false };
bool is_gemini_summoning{ false }; bool is_gemini_summoning{ false };
bool is_summon_negated{ false }; bool is_summon_negated{ false };
......
operations.cpp
View file @ 4d95c45d
...@@ -6422,7 +6422,7 @@ int32_t field::toss_coin(uint16_t step, effect * reason_effect, uint8_t reason_p ...@@ -6422,7 +6422,7 @@ int32_t field::toss_coin(uint16_t step, effect * reason_effect, uint8_t reason_p
pduel->write_buffer8(MSG_TOSS_COIN); pduel->write_buffer8(MSG_TOSS_COIN);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer8((uint8_t)count); pduel->write_buffer8((uint8_t)count);
core.coin_count = (uint8_t)count; core.coin_count = count;
core.coin_result = gen_bits(count); core.coin_result = gen_bits(count);
for (int32_t i = 0; i < count; ++i) { for (int32_t i = 0; i < count; ++i) {
pduel->write_buffer8((uint8_t)((core.coin_result >> i) & 1u)); pduel->write_buffer8((uint8_t)((core.coin_result >> i) & 1u));
...@@ -6438,7 +6438,7 @@ int32_t field::toss_coin(uint16_t step, effect * reason_effect, uint8_t reason_p ...@@ -6438,7 +6438,7 @@ int32_t field::toss_coin(uint16_t step, effect * reason_effect, uint8_t reason_p
break; break;
} }
} }
core.coin_count = (uint8_t)((first_zero == -1) ? MAX_COIN_COUNT : (first_zero + 1)); core.coin_count = (first_zero == -1) ? MAX_COIN_COUNT : (first_zero + 1);
core.coin_result = bits; core.coin_result = bits;
pduel->write_buffer8(MSG_TOSS_COIN); pduel->write_buffer8(MSG_TOSS_COIN);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
......
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