Skip to content

Y
ygopro-core
Commit 85dd1986 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

ocgapi change: return LEN_FAIL if not exist (#701)

parent 1a0b7125
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
ocgapi.cpp
View file @ 85dd1986
...@@ -192,7 +192,7 @@ extern "C" DECL_DLLEXPORT void new_tag_card(intptr_t pduel, uint32_t code, uint8 ...@@ -192,7 +192,7 @@ extern "C" DECL_DLLEXPORT void new_tag_card(intptr_t pduel, uint32_t code, uint8
} }
/** /**
* @brief Get card information. * @brief Get card information.
* @param buf uint32_t array * @param buf int32_t array
* @return buffer length in bytes * @return buffer length in bytes
*/ */
extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, uint8_t location, uint8_t sequence, int32_t query_flag, byte* buf, int32_t use_cache) { extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, uint8_t location, uint8_t sequence, int32_t query_flag, byte* buf, int32_t use_cache) {
...@@ -201,7 +201,7 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u ...@@ -201,7 +201,7 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u
duel* ptduel = (duel*)pduel; duel* ptduel = (duel*)pduel;
card* pcard = nullptr; card* pcard = nullptr;
location &= 0x7f; location &= 0x7f;
if(location & LOCATION_ONFIELD) if (location == LOCATION_MZONE || location == LOCATION_SZONE)
pcard = ptduel->game_field->get_field_card(playerid, location, sequence); pcard = ptduel->game_field->get_field_card(playerid, location, sequence);
else { else {
card_vector* lst = nullptr; card_vector* lst = nullptr;
...@@ -217,10 +217,9 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u ...@@ -217,10 +217,9 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u
lst = &ptduel->game_field->player[playerid].list_main; lst = &ptduel->game_field->player[playerid].list_main;
else else
return LEN_FAIL; return LEN_FAIL;
if(sequence >= (int32_t)lst->size()) if (sequence >= (int32_t)lst->size())
pcard = nullptr; return LEN_FAIL;
else pcard = (*lst)[sequence];
pcard = (*lst)[sequence];
} }
if (pcard) { if (pcard) {
return pcard->get_infos(buf, query_flag, use_cache); return pcard->get_infos(buf, query_flag, use_cache);
......
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