flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into foldermove2

Browse Source 
Conflicts:
	GNUmakefile
This commit is contained in:
Alexander Harkness
2013-11-24 14:37:03 +00:00
parent 4e463d591d dbb76ef9fe
commit c3cd436ec3
131 changed files with 6157 additions and 3632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/PluginLua.cpp
View File

@@ -86,11 +86,11 @@ bool cPluginLua::Initialize(void)
lua_setglobal(m_LuaState, "g_Plugin");
}
std::string PluginPath = FILE_IO_PREFIX + GetLocalDirectory() + "/";
std::string PluginPath = FILE_IO_PREFIX + GetLocalFolder() + "/";
// Load all files for this plugin, and execute them
AStringList Files = GetDirectoryContents(PluginPath.c_str());
for (AStringList::const_iterator itr = Files.begin(); itr != Files.end(); ++itr)
AStringVector Files = cFile::GetFolderContents(PluginPath.c_str());
for (AStringVector::const_iterator itr = Files.begin(); itr != Files.end(); ++itr)
{
if (itr->rfind(".lua") == AString::npos)
{