diff options
author | madmaxoft <github@xoft.cz> | 2014-05-01 23:38:35 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-05-01 23:38:35 +0200 |
commit | d950c8346fe0c89594e871f014f449e595c97706 (patch) | |
tree | 4d424d417ebf7aa7ca2c3eece5654e22855cde21 | |
parent | Fixed a warning in Noise. (diff) | |
download | cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar.gz cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar.bz2 cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar.lz cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar.xz cuberite-d950c8346fe0c89594e871f014f449e595c97706.tar.zst cuberite-d950c8346fe0c89594e871f014f449e595c97706.zip |
-rw-r--r-- | src/Bindings/LuaChunkStay.cpp | 2 | ||||
-rw-r--r-- | src/Bindings/LuaFunctions.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Bindings/LuaChunkStay.cpp b/src/Bindings/LuaChunkStay.cpp index db865cfa4..985a18a95 100644 --- a/src/Bindings/LuaChunkStay.cpp +++ b/src/Bindings/LuaChunkStay.cpp @@ -42,7 +42,7 @@ bool cLuaChunkStay::AddChunks(int a_ChunkCoordTableStackPos) // Add each set of coords: int NumChunks = luaL_getn(L, a_ChunkCoordTableStackPos); - m_Chunks.reserve(NumChunks); + m_Chunks.reserve((size_t)NumChunks); for (int idx = 1; idx <= NumChunks; idx++) { // Push the idx-th element of the array onto stack top, check that it's a table: diff --git a/src/Bindings/LuaFunctions.h b/src/Bindings/LuaFunctions.h index 4f9eab86d..629e2d77d 100644 --- a/src/Bindings/LuaFunctions.h +++ b/src/Bindings/LuaFunctions.h @@ -4,12 +4,12 @@ #include <time.h> // tolua_begin -unsigned int GetTime() +inline unsigned int GetTime() { return (unsigned int)time(0); } -std::string GetChar( std::string & a_Str, unsigned int a_Idx ) +inline std::string GetChar( std::string & a_Str, unsigned int a_Idx ) { return std::string(1, a_Str[ a_Idx ]); } |