Skip to content

Y
ygopro-2pick
Commit 4b7926a6 authored by Momobako's avatar Momobako
Browse files
Options

update_core

parent 3d42d336
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
ocgcore/ocgapi.cpp
View file @ 4b7926a6
...@@ -185,22 +185,20 @@ extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 loca ...@@ -185,22 +185,20 @@ extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 loca
pcard = ptduel->game_field->get_field_card(playerid, location, sequence); pcard = ptduel->game_field->get_field_card(playerid, location, sequence);
else { else {
field::card_vector* lst = 0; field::card_vector* lst = 0;
if(location == LOCATION_HAND ) if(location == LOCATION_HAND)
lst = &ptduel->game_field->player[playerid].list_hand; lst = &ptduel->game_field->player[playerid].list_hand;
else if(location == LOCATION_GRAVE ) else if(location == LOCATION_GRAVE)
lst = &ptduel->game_field->player[playerid].list_grave; lst = &ptduel->game_field->player[playerid].list_grave;
else if(location == LOCATION_REMOVED ) else if(location == LOCATION_REMOVED)
lst = &ptduel->game_field->player[playerid].list_remove; lst = &ptduel->game_field->player[playerid].list_remove;
else if(location == LOCATION_EXTRA ) else if(location == LOCATION_EXTRA)
lst = &ptduel->game_field->player[playerid].list_extra; lst = &ptduel->game_field->player[playerid].list_extra;
else if(location == LOCATION_DECK ) else if(location == LOCATION_DECK)
lst = &ptduel->game_field->player[playerid].list_main; lst = &ptduel->game_field->player[playerid].list_main;
if(!lst || sequence > lst->size()) if(!lst || sequence >= lst->size())
pcard = 0; pcard = 0;
else { else {
auto cit = lst->begin(); pcard = (*lst)[sequence];
for(uint32 i = 0; i < sequence; ++i, ++cit);
pcard = *cit;
} }
} }
if(pcard) if(pcard)
......
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