Skip to content

Y
ygopro-core
Commit 0a982873 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix get_xyz_material

parent c658d787
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
field.cpp
View file @ 0a982873
...@@ -1361,7 +1361,8 @@ void field::get_xyz_material(card* scard, int32 findex, uint32 lv, int32 maxc, g ...@@ -1361,7 +1361,8 @@ void field::get_xyz_material(card* scard, int32 findex, uint32 lv, int32 maxc, g
uint32 xyz_level; uint32 xyz_level;
if(mg) { if(mg) {
for (auto cit = mg->container.begin(); cit != mg->container.end(); ++cit) { for (auto cit = mg->container.begin(); cit != mg->container.end(); ++cit) {
if((xyz_level = (*cit)->check_xyz_level(scard, lv)) && (findex == 0 || pduel->lua->check_matching(*cit, findex, 0))) if((*cit)->is_can_be_xyz_material(scard) && (xyz_level = (*cit)->check_xyz_level(scard, lv))
&& (findex == 0 || pduel->lua->check_matching(*cit, findex, 0)))
core.xmaterial_lst.insert(std::make_pair((xyz_level >> 12) & 0xf, *cit)); core.xmaterial_lst.insert(std::make_pair((xyz_level >> 12) & 0xf, *cit));
} }
} else { } else {
......
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