Skip to content

Y
ygopro
Commit 56a1adc3 authored by Damien Lawford's avatar Damien Lawford
Browse files
Options

more c++ friendly 

allows compiling on older versions of c++
parent 78dea945
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
ocgcore/field.cpp
View file @ 56a1adc3
...@@ -1293,20 +1293,20 @@ void field::get_xyz_material(card* scard, int32 findex, int32 maxc) { ...@@ -1293,20 +1293,20 @@ void field::get_xyz_material(card* scard, int32 findex, int32 maxc) {
cv.push_back(pcard); cv.push_back(pcard);
} }
if(core.global_flag & GLOBALFLAG_XMAT_COUNT_LIMIT) { if(core.global_flag & GLOBALFLAG_XMAT_COUNT_LIMIT) {
for(auto pcard : cv) { for(auto pcard = cv.begin(); pcard != cv.end(); ++pcard) {
effect* peffect = pcard->is_affected_by_effect(EFFECT_XMAT_COUNT_LIMIT); effect* peffect = (*pcard)->is_affected_by_effect(EFFECT_XMAT_COUNT_LIMIT);
if(peffect) { if(peffect) {
int32 v = peffect->get_value(); int32 v = peffect->get_value();
core.xmaterial_lst.insert(std::make_pair(v, pcard)); core.xmaterial_lst.insert(std::make_pair(v, *pcard));
} else } else
core.xmaterial_lst.insert(std::make_pair(0, pcard)); core.xmaterial_lst.insert(std::make_pair(0, *pcard));
} }
auto iter = core.xmaterial_lst.begin(); auto iter = core.xmaterial_lst.begin();
while((iter != core.xmaterial_lst.end()) && ((iter->first > core.xmaterial_lst.size()) || (iter->first > maxc))) while((iter != core.xmaterial_lst.end()) && ((iter->first > core.xmaterial_lst.size()) || (iter->first > maxc)))
core.xmaterial_lst.erase(iter++); core.xmaterial_lst.erase(iter++);
} else { } else {
for(auto pcard : cv) for(auto pcard = cv.begin(); pcard != cv.end(); ++pcard)
core.xmaterial_lst.insert(std::make_pair(0, pcard)); core.xmaterial_lst.insert(std::make_pair(0, *pcard));
} }
} }
void field::get_overlay_group(uint8 self, uint8 s, uint8 o, card_set* pset) { void field::get_overlay_group(uint8 self, uint8 s, uint8 o, card_set* pset) {
...@@ -1680,25 +1680,25 @@ int32 field::check_xyz_material(card* scard, int32 findex, int32 min, int32 max, ...@@ -1680,25 +1680,25 @@ int32 field::check_xyz_material(card* scard, int32 findex, int32 min, int32 max,
if(mg) { if(mg) {
card_vector cv; card_vector cv;
core.xmaterial_lst.clear(); core.xmaterial_lst.clear();
for (auto pcard : mg->container) { for (auto pcard = mg->container.begin(); pcard != mg->container.end(); ++pcard) {
if(pduel->lua->check_matching(pcard, findex, 0)) if(pduel->lua->check_matching(*pcard, findex, 0))
cv.push_back(pcard); cv.push_back(*pcard);
} }
if(core.global_flag & GLOBALFLAG_XMAT_COUNT_LIMIT) { if(core.global_flag & GLOBALFLAG_XMAT_COUNT_LIMIT) {
for(auto pcard : cv) { for(auto pcard = cv.begin(); pcard != cv.end(); ++pcard) {
effect* peffect = pcard->is_affected_by_effect(EFFECT_XMAT_COUNT_LIMIT); effect* peffect = (*pcard)->is_affected_by_effect(EFFECT_XMAT_COUNT_LIMIT);
if(peffect) { if(peffect) {
int32 v = peffect->get_value(); int32 v = peffect->get_value();
core.xmaterial_lst.insert(std::make_pair(v, pcard)); core.xmaterial_lst.insert(std::make_pair(v, *pcard));
} else } else
core.xmaterial_lst.insert(std::make_pair(0, pcard)); core.xmaterial_lst.insert(std::make_pair(0, *pcard));
} }
auto iter = core.xmaterial_lst.begin(); auto iter = core.xmaterial_lst.begin();
while((iter != core.xmaterial_lst.end()) && ((iter->first > core.xmaterial_lst.size()) || (iter->first > max))) while((iter != core.xmaterial_lst.end()) && ((iter->first > core.xmaterial_lst.size()) || (iter->first > max)))
core.xmaterial_lst.erase(iter++); core.xmaterial_lst.erase(iter++);
} else { } else {
for(auto pcard : cv) for(auto pcard = cv.begin(); pcard != cv.end(); ++pcard)
core.xmaterial_lst.insert(std::make_pair(0, pcard)); core.xmaterial_lst.insert(std::make_pair(0, *pcard));
} }
} else { } else {
pduel->game_field->get_xyz_material(scard, findex, max); pduel->game_field->get_xyz_material(scard, findex, max);
......
ocgcore/operations.cpp
View file @ 56a1adc3
...@@ -3986,8 +3986,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32 ...@@ -3986,8 +3986,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32
maxv = core.xmaterial_lst.begin()->first; maxv = core.xmaterial_lst.begin()->first;
if(min >= maxv) { if(min >= maxv) {
core.select_cards.clear(); core.select_cards.clear();
for(auto iter : core.xmaterial_lst) for(auto iter = core.xmaterial_lst.begin(); iter != core.xmaterial_lst.end(); ++iter)
core.select_cards.push_back(iter.second); core.select_cards.push_back(iter->second);
pduel->write_buffer8(MSG_HINT); pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
...@@ -4009,8 +4009,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32 ...@@ -4009,8 +4009,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32
case 2: { case 2: {
core.operated_set.clear(); core.operated_set.clear();
core.select_cards.clear(); core.select_cards.clear();
for(auto iter : core.xmaterial_lst) for(auto iter = core.xmaterial_lst.begin(); iter != core.xmaterial_lst.end(); ++iter)
core.select_cards.push_back(iter.second); core.select_cards.push_back(iter->second);
pduel->write_buffer8(MSG_HINT); pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
...@@ -4055,8 +4055,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32 ...@@ -4055,8 +4055,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32
return TRUE; return TRUE;
} }
core.select_cards.clear(); core.select_cards.clear();
for(auto iter : core.xmaterial_lst) for(auto iter = core.xmaterial_lst.begin(); iter != core.xmaterial_lst.end(); iter++)
core.select_cards.push_back(iter.second); core.select_cards.push_back(iter->second);
int maxv = core.xmaterial_lst.begin()->first; int maxv = core.xmaterial_lst.begin()->first;
pduel->write_buffer8(MSG_HINT); pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
...@@ -4072,8 +4072,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32 ...@@ -4072,8 +4072,8 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, card* scard, int32
} }
case 5: { case 5: {
group* pgroup = pduel->new_group(); group* pgroup = pduel->new_group();
for(auto pcard : core.operated_set) for(auto pcard = core.operated_set.begin(); pcard != core.operated_set.end(); ++pcard)
pgroup->container.insert(pcard); pgroup->container.insert(*pcard);
for(int32 i = 0; i < returns.bvalue[0]; ++i) { for(int32 i = 0; i < returns.bvalue[0]; ++i) {
card* pcard = core.select_cards[returns.bvalue[i + 1]]; card* pcard = core.select_cards[returns.bvalue[i + 1]];
pgroup->container.insert(pcard); pgroup->container.insert(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