summaryrefslogtreecommitdiffstats
path: root/source/WebAdmin.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-09-21 19:00:01 +0200
committermadmaxoft <github@xoft.cz>2013-09-21 19:00:01 +0200
commit6b61df3b73f5ff26f1d85c48c2b13e4c71738946 (patch)
treedb8b8f70923a3caf5380e633b7cc68adc66bbcae /source/WebAdmin.h
parentFixed pickup spawning with inherited gamemode. (diff)
downloadcuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.gz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.bz2
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.lz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.xz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.zst
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.zip
Diffstat (limited to '')
-rw-r--r--source/WebAdmin.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/WebAdmin.h b/source/WebAdmin.h
index a62b532f1..7b710bd3b 100644
--- a/source/WebAdmin.h
+++ b/source/WebAdmin.h
@@ -95,7 +95,9 @@ public:
static void Request_Handler(webserver::http_request* r);
// tolua_begin
- static AString GetMemoryUsage(void);
+
+ /// Returns the amount of currently used memory, in KiB, or -1 if it cannot be queried
+ static int GetMemoryUsage(void);
int GetPort() { return m_Port; }