summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-17 16:33:09 +0200
committermadmaxoft <github@xoft.cz>2014-07-17 16:33:09 +0200
commit993fd14ddfc881cf5be951df77da0338124d68cc (patch)
tree828cd0c784698ca4533aeaf2592d9fed75fe55a3 /src/Root.cpp
parentMerge pull request #1183 from Howaner/Sounds (diff)
downloadcuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.gz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.bz2
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.lz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.xz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.zst
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.zip
Diffstat (limited to 'src/Root.cpp')
-rw-r--r--src/Root.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index ec1351ef1..235a1b108 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -84,7 +84,7 @@ void cRoot::InputThread(void * a_Params)
AString Command;
std::getline(std::cin, Command);
if (!Command.empty())
- {
+ {
self.ExecuteConsoleCommand(TrimString(Command), Output);
}
}
@@ -194,7 +194,7 @@ void cRoot::Start(void)
#if !defined(ANDROID_NDK)
LOGD("Starting InputThread...");
m_InputThread = new cThread( InputThread, this, "cRoot::InputThread" );
- m_InputThread->Start( false ); // We should NOT wait? Otherwise we can't stop the server from other threads than the input thread
+ m_InputThread->Start( false ); // We should NOT wait? Otherwise we can't stop the server from other threads than the input thread
#endif
long long finishmseconds = Time.GetNowTime();
@@ -687,7 +687,7 @@ int cRoot::GetVirtualRAMUsage(void)
&t_info_count
))
{
- return (int)(t_info.virtual_size / 1024);
+ return (int)(t_info.virtual_size / 1024);
}
return -1;
#else
@@ -739,7 +739,7 @@ int cRoot::GetPhysicalRAMUsage(void)
&t_info_count
))
{
- return (int)(t_info.resident_size / 1024);
+ return (int)(t_info.resident_size / 1024);
}
return -1;
#else