diff --git a/configure.ac b/configure.ac index 4b1997f5..1278da72 100644 --- a/configure.ac +++ b/configure.ac @@ -442,6 +442,7 @@ AC_CONFIG_FILES( people/peeweek/private/Makefile people/touky/Makefile people/touky/private/Makefile + people/touky/private/Tactics/Makefile people/jylam/Makefile people/jylam/private/Makefile people/jylam/private/chat/Makefile diff --git a/src/easymesh/easymesh.h b/src/easymesh/easymesh.h index 211ce4bc..460fe8d4 100644 --- a/src/easymesh/easymesh.h +++ b/src/easymesh/easymesh.h @@ -65,7 +65,7 @@ public: ShaderUniform const *GetUniform(const lol::String &uniform); ShaderAttrib const *GetAttribute(const lol::String &attribute); //-- - virtual void SetupShaderDatas(mat4 const &model) { } + virtual void SetupShaderDatas(mat4 const &model) { UNUSED(model); } protected: uint16_t m_vert_decl_flags; @@ -356,6 +356,7 @@ public: else { TexCoordBuildType tcbt = GetTexCoordBuildType2(mt); + UNUSED(tcbt); if (mt == MeshType::Triangle) mt = mt; else if (mt == MeshType::Quad) diff --git a/src/lol/math/interp.h b/src/lol/math/interp.h index 730b6024..64b2c33b 100644 --- a/src/lol/math/interp.h +++ b/src/lol/math/interp.h @@ -50,7 +50,7 @@ public: int start = max(0, m_pos); int a = 0; - int b = min(m_pos + N, N); + int b = min(m_pos + N - 1, N - 1); while (a + 1 < b) { diff --git a/src/numeric.h b/src/numeric.h index 8dc8a4eb..9c9d18af 100644 --- a/src/numeric.h +++ b/src/numeric.h @@ -26,7 +26,7 @@ namespace lol static inline float RandF() { using namespace std; - return (float)rand() / RAND_MAX; + return (float)std::rand() / RAND_MAX; } static inline float RandF(float val) diff --git a/src/scene.cpp b/src/scene.cpp index 0511902d..0a71810e 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -175,7 +175,7 @@ void Scene::Render() // XXX: rename to Blit() for (int i = 0; i < data->m_tiles.Count(); i++) { Tile tmp = data->m_tiles[i]; - int j = rand() % data->m_tiles.Count(); + int j = std::rand() % data->m_tiles.Count(); data->m_tiles[i] = data->m_tiles[j]; data->m_tiles[j] = tmp; } diff --git a/src/ticker.cpp b/src/ticker.cpp index e6dfc4b1..1094f7d8 100644 --- a/src/ticker.cpp +++ b/src/ticker.cpp @@ -185,7 +185,7 @@ void *TickerData::GameThreadMain(void * /* p */) data->frame++; /* Ensure some randomness */ - (void)rand(); + (void)std::rand(); /* If recording with fixed framerate, set deltatime to a fixed value */ if (data->recording && data->fps)