Commit 2eb68ba1 authored by Tianchenglipu's avatar Tianchenglipu

Update card.cpp

parent 93e6fa28
...@@ -270,6 +270,14 @@ int32 card::is_set_card(uint32 set_code) { ...@@ -270,6 +270,14 @@ int32 card::is_set_card(uint32 set_code) {
return TRUE; return TRUE;
setcode = setcode >> 16; setcode = setcode >> 16;
} }
//add set code
effect_set eset;
filter_effect(EFFECT_ADD_SET_CODE, &eset);
for(int32 i = 0; i < eset.size(); ++i) {
uint32 value = eset[i]->get_value(this);
if ((value & 0xfff) == settype && (value & 0xf000 & setsubtype) == setsubtype)
return TRUE;
}
//another code //another code
uint32 code2 = get_another_code(); uint32 code2 = get_another_code();
uint64 setcode2; uint64 setcode2;
...@@ -280,10 +288,8 @@ int32 card::is_set_card(uint32 set_code) { ...@@ -280,10 +288,8 @@ int32 card::is_set_card(uint32 set_code) {
} else { } else {
return FALSE; return FALSE;
} }
uint32 settype2 = setcode2 & 0xfff;
uint32 setsubtype2 = setcode2 & 0xf000;
while(setcode2) { while(setcode2) {
if ((setcode2 & 0xfff) == settype2 && (setcode2 & 0xf000 & setsubtype2) == setsubtype2) if ((setcode2 & 0xfff) == settype && (setcode2 & 0xf000 & setsubtype) == setsubtype)
return TRUE; return TRUE;
setcode2 = setcode2 >> 16; setcode2 = setcode2 >> 16;
} }
......
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