Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

delete tip when reload file is empty(it's normal)

This commit is contained in:
honghui 2014-10-08 17:06:58 +08:00
parent 3873bbc5f7
commit 91901c16cb
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
View File

@ -100,12 +100,11 @@ void startScript(string strDebugArg)
engine->executeScriptFile(ConfigParser::getInstance()->getEntryFile().c_str());
}
static bool resetLuaModule(string fileName)
static void resetLuaModule(const string& fileName)
{
if (fileName.empty())
{
CCLOG("fileName is null");
return false;
return;
}
auto engine = LuaEngine::getInstance();
LuaStack* luaStack = engine->getLuaStack();
@ -125,7 +124,7 @@ static bool resetLuaModule(string fileName)
tableKey = replaceAll(tableKey, "\\", "/");
tableKey.append(".lua");
found = fileName.rfind(tableKey);
if (0 == found || ( found != std::string::npos && fileName.at(found - 1) == '/'))
if (0 == found || (found != std::string::npos && fileName.at(found - 1) == '/'))
{
lua_pushstring(stack, key.c_str());
lua_pushnil(stack);
@ -137,8 +136,8 @@ static bool resetLuaModule(string fileName)
lua_pop(stack, 1);
}
lua_pop(stack, 2);
return true;
}
bool reloadScript(const string& file)
{
auto director = Director::getInstance();
@ -150,10 +149,16 @@ bool reloadScript(const string& file)
}
FileUtils::getInstance()->purgeCachedEntries();
string modulefile = file;
if (!resetLuaModule(modulefile))
if (! modulefile.empty())
{
resetLuaModule(modulefile);
}
else
{
modulefile = ConfigParser::getInstance()->getEntryFile().c_str();
}
auto engine = LuaEngine::getInstance();
LuaStack* luaStack = engine->getLuaStack();
std::string require = "require \'" + modulefile + "\'";