Skip to content

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

clean

parent 7e25037d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
effect.h
View file @ 1f1d9cba
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
//status //status
#define EFFECT_STATUS_AVAILABLE 0x0001 #define EFFECT_STATUS_AVAILABLE 0x0001
#define EFFECT_STATUS_ACTIVATED 0x0002 //#define EFFECT_STATUS_ACTIVATED 0x0002
#define EFFECT_COUNT_CODE_OATH 0x10000000 #define EFFECT_COUNT_CODE_OATH 0x10000000
#define EFFECT_COUNT_CODE_DUEL 0x20000000 #define EFFECT_COUNT_CODE_DUEL 0x20000000
......
libcard.cpp
View file @ 1f1d9cba
...@@ -1351,9 +1351,6 @@ int32 scriptlib::card_register_effect(lua_State *L) { ...@@ -1351,9 +1351,6 @@ 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 & 0x7f0)
|| (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 @ 1f1d9cba
...@@ -77,9 +77,6 @@ int32 scriptlib::duel_register_effect(lua_State *L) { ...@@ -77,9 +77,6 @@ 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 & 0x7f0)
|| (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