Commit 12f93a21 authored by Chen Bill's avatar Chen Bill Committed by GitHub

scriptlib: rename to is_effect_has_property (#659)

effect::code is not a bit field.
parent 4047c1a7
...@@ -42,7 +42,7 @@ int32 scriptlib::get_effect_property(lua_State* L, effect_member type) { ...@@ -42,7 +42,7 @@ int32 scriptlib::get_effect_property(lua_State* L, effect_member type) {
lua_pushinteger(L, value); lua_pushinteger(L, value);
return 1; return 1;
} }
int32 scriptlib::is_effect_property(lua_State* L, effect_member type) { int32 scriptlib::is_effect_has_property(lua_State* L, effect_member type) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**)lua_touserdata(L, 1); effect* peffect = *(effect**)lua_touserdata(L, 1);
...@@ -52,9 +52,6 @@ int32 scriptlib::is_effect_property(lua_State* L, effect_member type) { ...@@ -52,9 +52,6 @@ int32 scriptlib::is_effect_property(lua_State* L, effect_member type) {
case MEMBER_CATEGORY: case MEMBER_CATEGORY:
value = peffect->category; value = peffect->category;
break; break;
case MEMBER_CODE:
value = peffect->code;
break;
case MEMBER_RANGE: case MEMBER_RANGE:
value = peffect->range; value = peffect->range;
break; break;
...@@ -519,13 +516,13 @@ int32 scriptlib::effect_is_has_property(lua_State *L) { ...@@ -519,13 +516,13 @@ int32 scriptlib::effect_is_has_property(lua_State *L) {
return 1; return 1;
} }
int32 scriptlib::effect_is_has_category(lua_State *L) { int32 scriptlib::effect_is_has_category(lua_State *L) {
return is_effect_property(L, MEMBER_CATEGORY); return is_effect_has_property(L, MEMBER_CATEGORY);
} }
int32 scriptlib::effect_is_has_type(lua_State *L) { int32 scriptlib::effect_is_has_type(lua_State *L) {
return is_effect_property(L, MEMBER_TYPE); return is_effect_has_property(L, MEMBER_TYPE);
} }
int32 scriptlib::effect_is_has_range(lua_State* L) { int32 scriptlib::effect_is_has_range(lua_State* L) {
return is_effect_property(L, MEMBER_RANGE); return is_effect_has_property(L, MEMBER_RANGE);
} }
int32 scriptlib::effect_is_activatable(lua_State *L) { int32 scriptlib::effect_is_activatable(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
......
...@@ -310,7 +310,7 @@ public: ...@@ -310,7 +310,7 @@ public:
//Effect functions //Effect functions
static int32 get_effect_property(lua_State* L, effect_member type); static int32 get_effect_property(lua_State* L, effect_member type);
static int32 is_effect_property(lua_State* L, effect_member type); static int32 is_effect_has_property(lua_State* L, effect_member type);
static int32 effect_new(lua_State *L); static int32 effect_new(lua_State *L);
static int32 effect_newex(lua_State *L); static int32 effect_newex(lua_State *L);
static int32 effect_clone(lua_State *L); static int32 effect_clone(lua_State *L);
......
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