summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-18 00:20:35 +0200
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-18 00:20:35 +0200
commitc40af4c4ab0541638a6079a97c601a774ed65d02 (patch)
tree425de85573c9ca79f0216224fa3bbe69d5ea0930 /source
parentFixed an assert in bucket placement (diff)
downloadcuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar.gz
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar.bz2
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar.lz
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar.xz
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.tar.zst
cuberite-c40af4c4ab0541638a6079a97c601a774ed65d02.zip
Diffstat (limited to 'source')
-rw-r--r--source/cLog.cpp2
-rw-r--r--source/cPlugin_NewLua.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/cLog.cpp b/source/cLog.cpp
index d1874f7e2..57ad9b418 100644
--- a/source/cLog.cpp
+++ b/source/cLog.cpp
@@ -11,6 +11,7 @@
#if defined(ANDROID_NDK)
#include <android/log.h>
+#include "ToJava.h"
#endif
@@ -130,6 +131,7 @@ void cLog::Log(const char * a_Format, va_list argList)
// Print to console:
#if defined(ANDROID_NDK)
__android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, argList);
+ //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else
printf("%s", Line.c_str());
#endif
diff --git a/source/cPlugin_NewLua.cpp b/source/cPlugin_NewLua.cpp
index feba602ba..7f7f0c20c 100644
--- a/source/cPlugin_NewLua.cpp
+++ b/source/cPlugin_NewLua.cpp
@@ -73,7 +73,7 @@ bool cPlugin_NewLua::Initialize()
ManualBindings::Bind( m_LuaState );
}
- std::string PluginPath = std::string("Plugins/") + m_Directory + "/";
+ std::string PluginPath = FILE_IO_PREFIX + std::string("Plugins/") + m_Directory + "/";
// Load all files for this plugin, and execute them
AStringList Files = GetDirectoryContents(PluginPath.c_str());