Skip to content

Y
ygopro
Commit e27b107f authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent af5783ca
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
ocgcore/card.cpp
View file @ e27b107f
...@@ -248,10 +248,10 @@ int32 card::is_set_card(uint32 set_code) { ...@@ -248,10 +248,10 @@ int32 card::is_set_card(uint32 set_code) {
} }
uint32 settype = set_code & 0xfff; uint32 settype = set_code & 0xfff;
uint32 setsubtype = set_code & 0xf000; uint32 setsubtype = set_code & 0xf000;
while(setcode){ while(setcode) {
if ((setcode & 0xfff) == settype && (setcode & 0xf000 & setsubtype) == setsubtype) if ((setcode & 0xfff) == settype && (setcode & 0xf000 & setsubtype) == setsubtype)
return TRUE; return TRUE;
setcode = setcode>>16 setcode = setcode >> 16;
} }
return FALSE; return FALSE;
} }
......
ocgcore/libduel.cpp
View file @ e27b107f
...@@ -1010,7 +1010,10 @@ int32 scriptlib::duel_discard_hand(lua_State *L) { ...@@ -1010,7 +1010,10 @@ int32 scriptlib::duel_discard_hand(lua_State *L) {
} }
int32 scriptlib::duel_disable_shuffle_check(lua_State *L) { int32 scriptlib::duel_disable_shuffle_check(lua_State *L) {
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
pduel->game_field->core.shuffle_check_disabled = TRUE; uint8 disable = TRUE;
if(lua_gettop(L) > 0)
disable = lua_toboolean(L, 1);
pduel->game_field->core.shuffle_check_disabled = disable;
return 0; return 0;
} }
int32 scriptlib::duel_shuffle_deck(lua_State *L) { int32 scriptlib::duel_shuffle_deck(lua_State *L) {
......
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