| @@ -442,6 +442,7 @@ AC_CONFIG_FILES( | |||||
| people/peeweek/private/Makefile | people/peeweek/private/Makefile | ||||
| people/touky/Makefile | people/touky/Makefile | ||||
| people/touky/private/Makefile | people/touky/private/Makefile | ||||
| people/touky/private/Tactics/Makefile | |||||
| people/jylam/Makefile | people/jylam/Makefile | ||||
| people/jylam/private/Makefile | people/jylam/private/Makefile | ||||
| people/jylam/private/chat/Makefile | people/jylam/private/chat/Makefile | ||||
| @@ -65,7 +65,7 @@ public: | |||||
| ShaderUniform const *GetUniform(const lol::String &uniform); | ShaderUniform const *GetUniform(const lol::String &uniform); | ||||
| ShaderAttrib const *GetAttribute(const lol::String &attribute); | ShaderAttrib const *GetAttribute(const lol::String &attribute); | ||||
| //-- | //-- | ||||
| virtual void SetupShaderDatas(mat4 const &model) { } | |||||
| virtual void SetupShaderDatas(mat4 const &model) { UNUSED(model); } | |||||
| protected: | protected: | ||||
| uint16_t m_vert_decl_flags; | uint16_t m_vert_decl_flags; | ||||
| @@ -356,6 +356,7 @@ public: | |||||
| else | else | ||||
| { | { | ||||
| TexCoordBuildType tcbt = GetTexCoordBuildType2(mt); | TexCoordBuildType tcbt = GetTexCoordBuildType2(mt); | ||||
| UNUSED(tcbt); | |||||
| if (mt == MeshType::Triangle) | if (mt == MeshType::Triangle) | ||||
| mt = mt; | mt = mt; | ||||
| else if (mt == MeshType::Quad) | else if (mt == MeshType::Quad) | ||||
| @@ -50,7 +50,7 @@ public: | |||||
| int start = max(0, m_pos); | int start = max(0, m_pos); | ||||
| int a = 0; | int a = 0; | ||||
| int b = min(m_pos + N, N); | |||||
| int b = min(m_pos + N - 1, N - 1); | |||||
| while (a + 1 < b) | while (a + 1 < b) | ||||
| { | { | ||||
| @@ -26,7 +26,7 @@ namespace lol | |||||
| static inline float RandF() | static inline float RandF() | ||||
| { | { | ||||
| using namespace std; | using namespace std; | ||||
| return (float)rand() / RAND_MAX; | |||||
| return (float)std::rand() / RAND_MAX; | |||||
| } | } | ||||
| static inline float RandF(float val) | static inline float RandF(float val) | ||||
| @@ -175,7 +175,7 @@ void Scene::Render() // XXX: rename to Blit() | |||||
| for (int i = 0; i < data->m_tiles.Count(); i++) | for (int i = 0; i < data->m_tiles.Count(); i++) | ||||
| { | { | ||||
| Tile tmp = data->m_tiles[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[i] = data->m_tiles[j]; | ||||
| data->m_tiles[j] = tmp; | data->m_tiles[j] = tmp; | ||||
| } | } | ||||
| @@ -185,7 +185,7 @@ void *TickerData::GameThreadMain(void * /* p */) | |||||
| data->frame++; | data->frame++; | ||||
| /* Ensure some randomness */ | /* Ensure some randomness */ | ||||
| (void)rand(); | |||||
| (void)std::rand(); | |||||
| /* If recording with fixed framerate, set deltatime to a fixed value */ | /* If recording with fixed framerate, set deltatime to a fixed value */ | ||||
| if (data->recording && data->fps) | if (data->recording && data->fps) | ||||