Commit 5ec5f490 authored by salix5's avatar salix5

edit

parent c14d91eb
...@@ -59,7 +59,7 @@ int32 effect::is_disable_related() { ...@@ -59,7 +59,7 @@ int32 effect::is_disable_related() {
} }
int32 effect::is_can_be_forbidden() { int32 effect::is_can_be_forbidden() {
uint32 ctr = code & 0xf0000; uint32 ctr = code & 0xf0000;
if (is_flag(EFFECT_FLAG_CANNOT_DISABLE) && !is_flag(EFFECT_FLAG_CANNOT_NEGATED)) if (is_flag(EFFECT_FLAG_CANNOT_DISABLE) && !is_flag(EFFECT_FLAG_CANNOT_NEGATE))
return FALSE; return FALSE;
if (code == EFFECT_CHANGE_CODE || ctr == EFFECT_COUNTER_PERMIT || ctr == EFFECT_COUNTER_LIMIT) if (code == EFFECT_CHANGE_CODE || ctr == EFFECT_COUNTER_PERMIT || ctr == EFFECT_COUNTER_LIMIT)
return FALSE; return FALSE;
......
...@@ -150,7 +150,7 @@ enum effect_flag : uint32 { ...@@ -150,7 +150,7 @@ enum effect_flag : uint32 {
EFFECT_FLAG_ABSOLUTE_TARGET = 0x0040, EFFECT_FLAG_ABSOLUTE_TARGET = 0x0040,
EFFECT_FLAG_IGNORE_IMMUNE = 0x0080, EFFECT_FLAG_IGNORE_IMMUNE = 0x0080,
EFFECT_FLAG_SET_AVAILABLE = 0x0100, EFFECT_FLAG_SET_AVAILABLE = 0x0100,
EFFECT_FLAG_CANNOT_NEGATED = 0x0200, EFFECT_FLAG_CANNOT_NEGATE = 0x0200,
EFFECT_FLAG_CANNOT_DISABLE = 0x0400, EFFECT_FLAG_CANNOT_DISABLE = 0x0400,
EFFECT_FLAG_PLAYER_TARGET = 0x0800, EFFECT_FLAG_PLAYER_TARGET = 0x0800,
EFFECT_FLAG_BOTH_SIDE = 0x1000, EFFECT_FLAG_BOTH_SIDE = 0x1000,
......
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