Skip to content

Y
ygopro-core
Commit a517fad9 authored by salix5's avatar salix5
Browse files
Options

card_state: setcode use uint16_t

parent af4efd81
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
card.cpp
View file @ a517fad9
...@@ -2544,7 +2544,7 @@ void card::set_special_summon_status(effect* peffect) { ...@@ -2544,7 +2544,7 @@ void card::set_special_summon_status(effect* peffect) {
effect_set eset; effect_set eset;
pcard->filter_effect(EFFECT_ADD_SETCODE, &eset); pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
for(int32 i = 0; i < eset.size(); ++i) { for(int32 i = 0; i < eset.size(); ++i) {
spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard)); spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard) & 0xffff);
} }
spsummon.reason_effect = peffect; spsummon.reason_effect = peffect;
spsummon.reason_player = peffect->get_handler_player(); spsummon.reason_player = peffect->get_handler_player();
...@@ -2563,7 +2563,7 @@ void card::set_special_summon_status(effect* peffect) { ...@@ -2563,7 +2563,7 @@ void card::set_special_summon_status(effect* peffect) {
effect_set eset; effect_set eset;
pcard->filter_effect(EFFECT_ADD_SETCODE, &eset); pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
for(int32 i = 0; i < eset.size(); ++i) { for(int32 i = 0; i < eset.size(); ++i) {
spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard)); spsummon.setcode.push_back((uint32)eset[i]->get_value(pcard) & 0xffff);
} }
spsummon.reason_effect = cait->triggering_effect; spsummon.reason_effect = cait->triggering_effect;
spsummon.reason_player = cait->triggering_player; spsummon.reason_player = cait->triggering_player;
......
card.h
View file @ a517fad9
...@@ -26,7 +26,7 @@ struct chain; ...@@ -26,7 +26,7 @@ struct chain;
struct card_state { struct card_state {
uint32 code{ 0 }; uint32 code{ 0 };
uint32 code2{ 0 }; uint32 code2{ 0 };
std::vector<uint32> setcode; std::vector<uint16_t> setcode;
uint32 type{ 0 }; uint32 type{ 0 };
uint32 level{ 0 }; uint32 level{ 0 };
uint32 rank{ 0 }; uint32 rank{ 0 };
......
operations.cpp
View file @ a517fad9
...@@ -3946,7 +3946,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -3946,7 +3946,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
effect_set eset; effect_set eset;
pcard->filter_effect(EFFECT_ADD_SETCODE, &eset); pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
for(int32 i = 0; i < eset.size(); ++i) { for(int32 i = 0; i < eset.size(); ++i) {
pcard->previous.setcode.push_back((uint32)eset[i]->get_value(pcard)); pcard->previous.setcode.push_back((uint32)eset[i]->get_value(pcard) & 0xffff);
} }
} }
} }
......
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