Skip to content

Y
ygopro-core
Commit f144324b authored by wind2009's avatar wind2009
Browse files
Options

Merge branch 'patch_getszonecount' into develop

parents beefa669 4197fe4e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libduel.cpp
View file @ f144324b
...@@ -2037,7 +2037,7 @@ int32_t scriptlib::duel_get_szone_count(lua_State *L) { ...@@ -2037,7 +2037,7 @@ int32_t scriptlib::duel_get_szone_count(lua_State *L) {
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2);
for(int32_t p = 0; p < 2; p++) { for(int32_t p = 0; p < 2; p++) {
uint32_t digit = 0x1U; uint32_t digit = 0x100U;
for(auto& pcard : pduel->game_field->player[p].list_szone) { for(auto& pcard : pduel->game_field->player[p].list_szone) {
if(pcard && pcard != mcard && !(mgroup && mgroup->container.find(pcard) != mgroup->container.end())) { if(pcard && pcard != mcard && !(mgroup && mgroup->container.find(pcard) != mgroup->container.end())) {
used_location[p] |= digit; used_location[p] |= digit;
...@@ -2046,7 +2046,7 @@ int32_t scriptlib::duel_get_szone_count(lua_State *L) { ...@@ -2046,7 +2046,7 @@ int32_t scriptlib::duel_get_szone_count(lua_State *L) {
list_szone[p].push_back(nullptr); list_szone[p].push_back(nullptr);
digit <<= 1; digit <<= 1;
} }
used_location[p] |= pduel->game_field->player[p].used_location & 0xff00; used_location[p] |= pduel->game_field->player[p].used_location & 0xff;
std::swap(used_location[p], pduel->game_field->player[p].used_location); std::swap(used_location[p], pduel->game_field->player[p].used_location);
pduel->game_field->player[p].list_szone.swap(list_szone[p]); pduel->game_field->player[p].list_szone.swap(list_szone[p]);
} }
......
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