Skip to content

Y
ygopro-core
Commit cf73af57 authored by DailyShana's avatar DailyShana
Browse files
Options

fix EFFECT_STATUS_ACTIVATED

parent 37aa2592
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
card.cpp
View file @ cf73af57
...@@ -1287,9 +1287,6 @@ int32 card::add_effect(effect* peffect) { ...@@ -1287,9 +1287,6 @@ int32 card::add_effect(effect* peffect) {
} }
indexer.insert(std::make_pair(peffect, eit)); indexer.insert(std::make_pair(peffect, eit));
peffect->handler = this; peffect->handler = this;
if((peffect->type & 0x7e0)
|| (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED;
if (peffect->in_range(current.location, current.sequence) && (peffect->type & EFFECT_TYPE_FIELD)) if (peffect->in_range(current.location, current.sequence) && (peffect->type & EFFECT_TYPE_FIELD))
pduel->game_field->add_effect(peffect); pduel->game_field->add_effect(peffect);
if (current.controler != PLAYER_NONE && check_target) { if (current.controler != PLAYER_NONE && check_target) {
......
field.cpp
View file @ cf73af57
...@@ -723,9 +723,6 @@ void field::add_effect(effect* peffect, uint8 owner_player) { ...@@ -723,9 +723,6 @@ void field::add_effect(effect* peffect, uint8 owner_player) {
peffect->effect_owner = owner_player; peffect->effect_owner = owner_player;
peffect->id = infos.field_id++; peffect->id = infos.field_id++;
} }
if((peffect->type & 0x7e0)
|| (core.reason_effect && (core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED;
peffect->card_type = peffect->owner->data.type; peffect->card_type = peffect->owner->data.type;
effect_container::iterator it; effect_container::iterator it;
if (!(peffect->type & EFFECT_TYPE_ACTIONS)) { if (!(peffect->type & EFFECT_TYPE_ACTIONS)) {
......
libcard.cpp
View file @ cf73af57
...@@ -985,6 +985,9 @@ int32 scriptlib::card_register_effect(lua_State *L) { ...@@ -985,6 +985,9 @@ int32 scriptlib::card_register_effect(lua_State *L) {
pduel->game_field->core.reseted_effects.insert(peffect); pduel->game_field->core.reseted_effects.insert(peffect);
return 0; return 0;
} }
if((peffect->type & 0x7e0)
|| (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED;
int32 id; int32 id;
if (peffect->handler) if (peffect->handler)
id = -1; id = -1;
......
libduel.cpp
View file @ cf73af57
...@@ -71,6 +71,9 @@ int32 scriptlib::duel_register_effect(lua_State *L) { ...@@ -71,6 +71,9 @@ int32 scriptlib::duel_register_effect(lua_State *L) {
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = peffect->pduel; duel* pduel = peffect->pduel;
if((peffect->type & 0x7e0)
|| (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED;
pduel->game_field->add_effect(peffect, playerid); pduel->game_field->add_effect(peffect, playerid);
return 0; return 0;
} }
......
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