Commit 6a708742 authored by salix5's avatar salix5

field::select_counter()

Now a player can remove 2^16-1=65535 counters from each card.
parent 36b7354f
......@@ -710,8 +710,8 @@ int32 field::remove_counter(uint16 step, uint32 reason, card* pcard, uint8 rplay
}
case 2: {
for(uint32 i = 0; i < core.select_cards.size(); ++i)
if(returns.bvalue[i] > 0)
core.select_cards[i]->remove_counter(countertype, returns.bvalue[i]);
if(returns.svalue[i] > 0)
core.select_cards[i]->remove_counter(countertype, returns.svalue[i]);
return FALSE;
}
case 3: {
......
......@@ -547,11 +547,11 @@ int32 field::select_counter(uint16 step, uint8 playerid, uint16 countertype, uin
} else {
uint16 ct = 0;
for(uint32 i = 0; i < core.select_cards.size(); ++i) {
if(core.select_cards[i]->get_counter(countertype) < returns.bvalue[i]) {
if(core.select_cards[i]->get_counter(countertype) < returns.svalue[i]) {
pduel->write_buffer8(MSG_RETRY);
return FALSE;
}
ct += returns.bvalue[i];
ct += returns.svalue[i];
}
if(ct != count) {
pduel->write_buffer8(MSG_RETRY);
......
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