Skip to content

Y
ygopro-core
Commit b5f28bc4 authored by DailyShana's avatar DailyShana Committed by GitHub
Browse files
Options

remove STATUS_ACTIVATED (#178)

parent 6822d15c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
card.h
View file @ b5f28bc4
......@@ -382,7 +382,7 @@ public:
#define STATUS_FUTURE_FUSION 0x100000
#define STATUS_ATTACK_CANCELED 0x200000
#define STATUS_INITIALIZING 0x400000
#define STATUS_ACTIVATED 0x800000
//#define STATUS_ACTIVATED 0x800000
#define STATUS_JUST_POS 0x1000000
#define STATUS_CONTINUOUS_POS 0x2000000
#define STATUS_FORBIDDEN 0x4000000
......
operations.cpp
View file @ b5f28bc4
......@@ -4358,10 +4358,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
pzone = TRUE;
move_card(playerid, target, location, target->temp.sequence, pzone);
target->current.position = returns.ivalue[0];
if((target->previous.location & LOCATION_ONFIELD) && (location & LOCATION_ONFIELD))
target->set_status(STATUS_LEAVE_CONFIRMED, FALSE);
else
target->set_status(STATUS_LEAVE_CONFIRMED | STATUS_ACTIVATED, FALSE);
target->set_status(STATUS_LEAVE_CONFIRMED, FALSE);
pduel->write_buffer32(target->get_info_location());
pduel->write_buffer32(target->current.reason);
if((target->current.location != LOCATION_MZONE)) {
......
processor.cpp
View file @ b5f28bc4
......@@ -4662,7 +4662,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
effect* peffect = cait->triggering_effect;
card* pcard = peffect->get_handler();
if((peffect->type & EFFECT_TYPE_ACTIVATE) && pcard->is_has_relation(*cait)) {
pcard->set_status(STATUS_ACTIVATED, TRUE);
pcard->enable_field_effect(true);
if(core.duel_rule <= 2) {
if(pcard->data.type & TYPE_FIELD) {
......
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