Skip to content

Commit

Permalink
remove warning C4018
Browse files Browse the repository at this point in the history
  • Loading branch information
@salix5
salix5 committed Feb 7, 2025
1 parent 0e599a0 commit b633d09
Show file tree
Hide file tree
Showing 7 changed files with 173 additions and 173 deletions.
140 changes: 70 additions & 70 deletions card.cpp
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions effect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int32_t effect::get_required_handorset_effects(effect_set* eset, uint8_t playeri
uint8_t op = pduel->game_field->core.reason_player;
pduel->game_field->core.reason_player = playerid;
pduel->game_field->save_lp_cost();
for(int32_t i = 0; i < tmp_eset.size(); ++i) {
for(effect_set::size_type i = 0; i < tmp_eset.size(); ++i) {
auto peffect = tmp_eset[i];
if(peffect->check_count_limit(playerid)) {
pduel->game_field->core.reason_effect = peffect;
Expand Down Expand Up @@ -378,15 +378,15 @@ int32_t effect::is_activateable(uint8_t playerid, const tevent& e, int32_t negle
int32_t effect::is_action_check(uint8_t playerid) {
effect_set eset;
pduel->game_field->filter_player_effect(playerid, EFFECT_CANNOT_ACTIVATE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(this, PARAM_TYPE_EFFECT);
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
if(eset[i]->check_value_condition(2))
return FALSE;
}
eset.clear();
pduel->game_field->filter_player_effect(playerid, EFFECT_ACTIVATE_COST, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
pduel->lua->add_param(this, PARAM_TYPE_EFFECT);
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
Expand Down Expand Up @@ -574,7 +574,7 @@ int32_t effect::is_player_effect_target(card* pcard) {
}
int32_t effect::is_immuned(card* pcard) {
const effect_set_v& effects = pcard->immune_effect;
for (int32_t i = 0; i < effects.size(); ++i) {
for (effect_set::size_type i = 0; i < effects.size(); ++i) {
effect* peffect = effects[i];
if(peffect->is_available() && peffect->value) {
pduel->lua->add_param(this, PARAM_TYPE_EFFECT);
Expand Down
56 changes: 28 additions & 28 deletions field.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ int32_t field::get_mzone_limit(uint8_t playerid, uint8_t uplayer, uint32_t reaso
effect_set eset;
if(uplayer < 2)
filter_player_effect(playerid, EFFECT_MAX_MZONE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
pduel->lua->add_param(uplayer, PARAM_TYPE_INT);
pduel->lua->add_param(reason, PARAM_TYPE_INT);
Expand All @@ -788,7 +788,7 @@ int32_t field::get_szone_limit(uint8_t playerid, uint8_t uplayer, uint32_t reaso
if(uplayer < 2)
filter_player_effect(playerid, EFFECT_MAX_SZONE, &eset);
int32_t max = 5;
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
pduel->lua->add_param(uplayer, PARAM_TYPE_INT);
pduel->lua->add_param(reason, PARAM_TYPE_INT);
Expand Down Expand Up @@ -835,7 +835,7 @@ void field::filter_must_use_mzone(uint8_t playerid, uint8_t uplayer, uint32_t re
filter_player_effect(uplayer, EFFECT_MUST_USE_MZONE, &eset);
if(pcard)
pcard->filter_effect(EFFECT_MUST_USE_MZONE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(eset[i]->is_flag(EFFECT_FLAG_COUNT_LIMIT) && eset[i]->count_limit == 0)
continue;
uint32_t value = 0x1f;
Expand Down Expand Up @@ -1752,7 +1752,7 @@ int32_t field::get_summon_release_list(card* target, card_set* release_list, car
card_set ex_tribute;
effect_set eset;
target->filter_effect(EFFECT_ADD_EXTRA_TRIBUTE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(eset[i]->get_value() & pos)
filter_inrange_cards(eset[i], &ex_tribute);
}
Expand Down Expand Up @@ -1815,7 +1815,7 @@ int32_t field::get_summon_count_limit(uint8_t playerid) {
effect_set eset;
filter_player_effect(playerid, EFFECT_SET_SUMMON_COUNT_LIMIT, &eset);
int32_t count = 1;
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
int32_t c = eset[i]->get_value();
if(c > count)
count = c;
Expand All @@ -1829,7 +1829,7 @@ int32_t field::get_draw_count(uint8_t playerid) {
effect_set eset;
filter_player_effect(playerid, EFFECT_DRAW_COUNT, &eset);
int32_t count = player[playerid].draw_count;
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
int32_t c = eset[i]->get_value();
if(c == 0)
return 0;
Expand Down Expand Up @@ -2303,7 +2303,7 @@ int32_t field::check_lp_cost(uint8_t playerid, int32_t cost, uint32_t must_pay)
effect_set eset;
int32_t val = cost;
filter_player_effect(playerid, EFFECT_LPCOST_CHANGE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(core.reason_effect, PARAM_TYPE_EFFECT);
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
pduel->lua->add_param(val, PARAM_TYPE_INT);
Expand Down Expand Up @@ -2416,15 +2416,15 @@ int32_t field::get_attack_target(card* pcard, card_vector* v, uint8_t chain_atta
int32_t extra_count = 0;
effect_set eset;
pcard->filter_effect(EFFECT_EXTRA_ATTACK, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
int32_t val = eset[i]->get_value(pcard);
if(val > extra_count)
extra_count = val;
}
int32_t extra_count_m = 0;
eset.clear();
pcard->filter_effect(EFFECT_EXTRA_ATTACK_MONSTER, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
int32_t val = eset[i]->get_value(pcard);
if(val > extra_count_m)
extra_count_m = val;
Expand Down Expand Up @@ -2504,7 +2504,7 @@ void field::attack_all_target_check() {
int32_t field::get_must_material_list(uint8_t playerid, uint32_t limit, card_set* must_list) {
effect_set eset;
filter_player_effect(playerid, limit, &eset);
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
must_list->insert(eset[i]->handler);
return (int32_t)must_list->size();
}
Expand Down Expand Up @@ -3083,7 +3083,7 @@ int32_t field::is_player_can_discard_deck_as_cost(uint8_t playerid, int32_t coun
bool cant_remove_o = !is_player_can_action(1 - playerid, EFFECT_CANNOT_REMOVE);
effect_set eset;
filter_field_effect(EFFECT_TO_GRAVE_REDIRECT, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
uint32_t redirect = eset[i]->get_value();
uint8_t p = eset[i]->get_handler_player();
if(redirect & LOCATION_REMOVED) {
Expand All @@ -3102,7 +3102,7 @@ int32_t field::is_player_can_discard_hand(uint8_t playerid, card * pcard, effect
return FALSE;
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_DISCARD_HAND, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3117,7 +3117,7 @@ int32_t field::is_player_can_discard_hand(uint8_t playerid, card * pcard, effect
int32_t field::is_player_can_action(uint8_t playerid, uint32_t actionlimit) {
effect_set eset;
filter_player_effect(playerid, actionlimit, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
}
Expand All @@ -3127,7 +3127,7 @@ int32_t field::is_player_can_summon(uint32_t sumtype, uint8_t playerid, card * p
effect_set eset;
sumtype |= SUMMON_TYPE_NORMAL;
filter_player_effect(playerid, EFFECT_CANNOT_SUMMON, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3145,7 +3145,7 @@ int32_t field::is_player_can_mset(uint32_t sumtype, uint8_t playerid, card * pca
effect_set eset;
sumtype |= SUMMON_TYPE_NORMAL;
filter_player_effect(playerid, EFFECT_CANNOT_MSET, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3162,7 +3162,7 @@ int32_t field::is_player_can_mset(uint32_t sumtype, uint8_t playerid, card * pca
int32_t field::is_player_can_sset(uint8_t playerid, card * pcard) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_SSET, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3177,7 +3177,7 @@ int32_t field::is_player_can_sset(uint8_t playerid, card * pcard) {
int32_t field::is_player_can_spsummon(uint8_t playerid) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_SPECIAL_SUMMON, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
}
Expand Down Expand Up @@ -3206,7 +3206,7 @@ int32_t field::is_player_can_spsummon(effect* reason_effect, uint32_t sumtype, u
position = (position & POS_FACEUP) | ((position & POS_FACEDOWN) >> 1);
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_SPECIAL_SUMMON, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3228,7 +3228,7 @@ int32_t field::is_player_can_spsummon(effect* reason_effect, uint32_t sumtype, u
int32_t field::is_player_can_flipsummon(uint8_t playerid, card * pcard) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_FLIP_SUMMON, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3248,7 +3248,7 @@ int32_t field::is_player_can_spsummon_monster(uint8_t playerid, uint8_t toplayer
int32_t field::is_player_can_release(uint8_t playerid, card* pcard, uint32_t reason) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_RELEASE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3263,7 +3263,7 @@ int32_t field::is_player_can_release(uint8_t playerid, card* pcard, uint32_t rea
int32_t field::is_player_can_spsummon_count(uint8_t playerid, uint32_t count) {
effect_set eset;
filter_player_effect(playerid, EFFECT_LEFT_SPSUMMON_COUNT, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(core.reason_effect, PARAM_TYPE_EFFECT);
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
int32_t v = eset[i]->get_value(2);
Expand All @@ -3275,7 +3275,7 @@ int32_t field::is_player_can_spsummon_count(uint8_t playerid, uint32_t count) {
int32_t field::is_player_can_place_counter(uint8_t playerid, card * pcard, uint16_t countertype, uint16_t count) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_PLACE_COUNTER, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand Down Expand Up @@ -3327,7 +3327,7 @@ int32_t field::is_player_can_remove_overlay_card(uint8_t playerid, card * pcard,
int32_t field::is_player_can_send_to_grave(uint8_t playerid, card * pcard) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_TO_GRAVE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3341,7 +3341,7 @@ int32_t field::is_player_can_send_to_grave(uint8_t playerid, card * pcard) {
int32_t field::is_player_can_send_to_hand(uint8_t playerid, card * pcard) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_TO_HAND, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3358,7 +3358,7 @@ int32_t field::is_player_can_send_to_hand(uint8_t playerid, card * pcard) {
int32_t field::is_player_can_send_to_deck(uint8_t playerid, card * pcard) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_TO_DECK, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3372,7 +3372,7 @@ int32_t field::is_player_can_send_to_deck(uint8_t playerid, card * pcard) {
int32_t field::is_player_can_remove(uint8_t playerid, card * pcard, uint32_t reason) {
effect_set eset;
filter_player_effect(playerid, EFFECT_CANNOT_REMOVE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->target)
return FALSE;
pduel->lua->add_param(eset[i], PARAM_TYPE_EFFECT);
Expand All @@ -3397,7 +3397,7 @@ int32_t field::is_chain_negatable(uint8_t chaincount) {
if(peffect->is_flag(EFFECT_FLAG_CANNOT_INACTIVATE))
return FALSE;
filter_field_effect(EFFECT_CANNOT_INACTIVATE, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(chaincount, PARAM_TYPE_INT);
if(eset[i]->check_value_condition(1))
return FALSE;
Expand All @@ -3417,7 +3417,7 @@ int32_t field::is_chain_disablable(uint8_t chaincount) {
if(peffect->is_flag(EFFECT_FLAG_CANNOT_DISABLE))
return FALSE;
filter_field_effect(EFFECT_CANNOT_DISEFFECT, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
pduel->lua->add_param(chaincount, PARAM_TYPE_INT);
if(eset[i]->check_value_condition(1))
return FALSE;
Expand Down
10 changes: 5 additions & 5 deletions libcard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int32_t scriptlib::card_get_fusion_code(lua_State *L) {
return count;
effect_set eset;
pcard->filter_effect(EFFECT_ADD_FUSION_CODE, &eset);
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
lua_pushinteger(L, eset[i]->get_value(pcard));
return count + eset.size();
}
Expand All @@ -80,7 +80,7 @@ int32_t scriptlib::card_get_link_code(lua_State *L) {
}
effect_set eset;
pcard->filter_effect(EFFECT_ADD_LINK_CODE, &eset);
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
lua_pushinteger(L, eset[i]->get_value(pcard));
return count + eset.size();
}
Expand All @@ -98,7 +98,7 @@ int32_t scriptlib::card_is_fusion_code(lua_State *L) {
fcode.insert(code1);
if(code2)
fcode.insert(code2);
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
fcode.insert(eset[i]->get_value(pcard));
uint32_t count = lua_gettop(L) - 1;
uint32_t result = FALSE;
Expand Down Expand Up @@ -128,7 +128,7 @@ int32_t scriptlib::card_is_link_code(lua_State *L) {
fcode.insert(code1);
if(code2)
fcode.insert(code2);
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
fcode.insert(eset[i]->get_value(pcard));
uint32_t count = lua_gettop(L) - 1;
uint32_t result = FALSE;
Expand Down Expand Up @@ -1858,7 +1858,7 @@ int32_t scriptlib::card_is_has_effect(lua_State *L) {
check_player = PLAYER_NONE;
}
int32_t size = 0;
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(check_player == PLAYER_NONE || eset[i]->check_count_limit(check_player)) {
interpreter::effect2value(L, eset[i]);
++size;
Expand Down
4 changes: 2 additions & 2 deletions libduel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ int32_t scriptlib::duel_get_flag_effect_label(lua_State *L) {
lua_pushnil(L);
return 1;
}
for(int32_t i = 0; i < eset.size(); ++i)
for(effect_set::size_type i = 0; i < eset.size(); ++i)
lua_pushinteger(L, eset[i]->label.size() ? eset[i]->label[0] : 0);
return eset.size();
}
Expand Down Expand Up @@ -4281,7 +4281,7 @@ int32_t scriptlib::duel_is_player_affected_by_effect(lua_State *L) {
effect_set eset;
pduel->game_field->filter_player_effect(playerid, code, &eset);
int32_t size = 0;
for(int32_t i = 0; i < eset.size(); ++i) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(eset[i]->check_count_limit(playerid)) {
interpreter::effect2value(L, eset[i]);
++size;
Expand Down
Loading

0 comments on commit b633d09

Please sign in to comment.