Commit 73bda6d3 authored by Chen Bill's avatar Chen Bill

remove Group.ForEach

parent 8f18da0f
...@@ -133,22 +133,6 @@ int32 scriptlib::group_get_count(lua_State *L) { ...@@ -133,22 +133,6 @@ int32 scriptlib::group_get_count(lua_State *L) {
lua_pushinteger(L, pgroup->container.size()); lua_pushinteger(L, pgroup->container.size());
return 1; return 1;
} }
int32 scriptlib::group_for_each(lua_State *L) {
check_param_count(L, 2);
check_param(L, PARAM_TYPE_GROUP, 1);
check_param(L, PARAM_TYPE_FUNCTION, 2);
duel* pduel = interpreter::get_duel_info(L);
group* pgroup = *(group**) lua_touserdata(L, 1);
int32 f = interpreter::get_function_handle(L, 2);
int32 extraargs = lua_gettop(L) - 2;
for (auto& pcard : pgroup->container) {
pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
for(int32 i = 0; i < extraargs; ++i)
pduel->lua->add_param(-extraargs + i, PARAM_TYPE_INDEX);
pduel->lua->call_function(f, 1 + extraargs, 0);
}
return 0;
}
int32 scriptlib::group_filter(lua_State *L) { int32 scriptlib::group_filter(lua_State *L) {
check_param_count(L, 3); check_param_count(L, 3);
check_param(L, PARAM_TYPE_GROUP, 1); check_param(L, PARAM_TYPE_GROUP, 1);
...@@ -924,7 +908,6 @@ static const struct luaL_Reg grouplib[] = { ...@@ -924,7 +908,6 @@ static const struct luaL_Reg grouplib[] = {
{ "GetFirst", scriptlib::group_get_first }, { "GetFirst", scriptlib::group_get_first },
{ "GetCount", scriptlib::group_get_count }, { "GetCount", scriptlib::group_get_count },
{ "__len", scriptlib::group_get_count }, { "__len", scriptlib::group_get_count },
{ "ForEach", scriptlib::group_for_each },
{ "Filter", scriptlib::group_filter }, { "Filter", scriptlib::group_filter },
{ "FilterCount", scriptlib::group_filter_count }, { "FilterCount", scriptlib::group_filter_count },
{ "FilterSelect", scriptlib::group_filter_select }, { "FilterSelect", scriptlib::group_filter_select },
......
...@@ -365,7 +365,6 @@ public: ...@@ -365,7 +365,6 @@ public:
static int32 group_get_next(lua_State *L); static int32 group_get_next(lua_State *L);
static int32 group_get_first(lua_State *L); static int32 group_get_first(lua_State *L);
static int32 group_get_count(lua_State *L); static int32 group_get_count(lua_State *L);
static int32 group_for_each(lua_State *L);
static int32 group_filter(lua_State *L); static int32 group_filter(lua_State *L);
static int32 group_filter_count(lua_State *L); static int32 group_filter_count(lua_State *L);
static int32 group_filter_select(lua_State *L); static int32 group_filter_select(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