Commit 6830f58c authored by Nanahira's avatar Nanahira Committed by GitHub

Merge pull request #23 from mycard/develop-8888

remove const for link functions
parents 9f997a2a 83322f52
...@@ -1345,7 +1345,7 @@ uint32 card::get_rscale() { ...@@ -1345,7 +1345,7 @@ uint32 card::get_rscale() {
temp.rscale = UINT32_MAX; temp.rscale = UINT32_MAX;
return rscale; return rscale;
} }
uint32 card::get_link_marker() const { uint32 card::get_link_marker() {
effect_set effects; effect_set effects;
effect_set effects2; effect_set effects2;
uint32 link_marker = data.link_marker; uint32 link_marker = data.link_marker;
...@@ -1378,10 +1378,10 @@ uint32 card::get_link_marker() const { ...@@ -1378,10 +1378,10 @@ uint32 card::get_link_marker() const {
} }
return link_marker; return link_marker;
} }
uint32 card::is_link_marker(uint32 dir) const { uint32 card::is_link_marker(uint32 dir) {
return get_link_marker() & dir; return get_link_marker() & dir;
} }
uint32 card::get_linked_zone() const { uint32 card::get_linked_zone() {
if((!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field()) if((!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field())
&& (!is_affected_by_effect(EFFECT_LINK_SPELL_KOISHI) || current.location != LOCATION_SZONE)) && (!is_affected_by_effect(EFFECT_LINK_SPELL_KOISHI) || current.location != LOCATION_SZONE))
return 0; return 0;
...@@ -1448,7 +1448,7 @@ void card::get_linked_cards(card_set* cset) { ...@@ -1448,7 +1448,7 @@ void card::get_linked_cards(card_set* cset) {
pduel->game_field->get_cards_in_zone(cset, linked_zone, p, LOCATION_MZONE); pduel->game_field->get_cards_in_zone(cset, linked_zone, p, LOCATION_MZONE);
pduel->game_field->get_cards_in_zone(cset, linked_zone >> 16, 1 - p, LOCATION_MZONE); pduel->game_field->get_cards_in_zone(cset, linked_zone >> 16, 1 - p, LOCATION_MZONE);
} }
uint32 card::get_mutual_linked_zone() const { uint32 card::get_mutual_linked_zone() {
if(!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field()) if(!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field())
return 0; return 0;
uint32 zones = 0; uint32 zones = 0;
......
...@@ -272,11 +272,11 @@ public: ...@@ -272,11 +272,11 @@ public:
uint32 get_grave_race(uint8 playerid); uint32 get_grave_race(uint8 playerid);
uint32 get_lscale(); uint32 get_lscale();
uint32 get_rscale(); uint32 get_rscale();
uint32 get_link_marker() const; uint32 get_link_marker();
uint32 is_link_marker(uint32 dir) const; uint32 is_link_marker(uint32 dir);
uint32 get_linked_zone() const; uint32 get_linked_zone();
void get_linked_cards(card_set* cset); void get_linked_cards(card_set* cset);
uint32 get_mutual_linked_zone() const; uint32 get_mutual_linked_zone();
void get_mutual_linked_cards(card_set * cset); void get_mutual_linked_cards(card_set * cset);
int32 is_link_state(); int32 is_link_state();
int32 is_extra_link_state(); int32 is_extra_link_state();
......
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