merge develop

This commit is contained in:
yihaoDeng 2021-07-07 05:50:07 +08:00
parent ec1ee6db19
commit d805b283ea
1 changed files with 1 additions and 1 deletions

View File

@ -435,7 +435,7 @@ bool isValidScript(char *script, int32_t len) {
qError("error at %s name: %s, len = %d", script, name, (int)(strlen(name))); qError("error at %s name: %s, len = %d", script, name, (int)(strlen(name)));
return false; return false;
} }
bool ret = hasBaseFuncDefinedInScript(lua, name, strlen(name)); bool ret = hasBaseFuncDefinedInScript(lua, name, (int32_t)strlen(name));
lua_pop(lua, 1); // pop lua_pop(lua, 1); // pop
addScriptEnvToPool(pEnv); addScriptEnvToPool(pEnv);
return ret; return ret;