diff --git a/src/easymesh/easymeshrender.h b/src/easymesh/easymeshrender.h index 97b2d220..8f92017d 100644 --- a/src/easymesh/easymeshrender.h +++ b/src/easymesh/easymeshrender.h @@ -1,8 +1,8 @@ // // Lol Engine // -// Copyright © 2009—2013 Benjamin “Touky” Huet -// © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar +// © 2009—2013 Benjamin “Touky” Huet // © 2009—2013 Cédric Lecacheur // // Lol Engine is free software. It comes without any warranty, to diff --git a/src/engine/tickable.cpp b/src/engine/tickable.cpp index 049c03fb..b9726788 100644 --- a/src/engine/tickable.cpp +++ b/src/engine/tickable.cpp @@ -39,10 +39,13 @@ void tickable::fini() void tickable::tick_game(float seconds) { + (void)seconds; } void tickable::tick_draw(float seconds, class Scene &scene) { + (void)seconds; + (void)scene; } } /* namespace lol */ diff --git a/src/engine/ticker.cpp b/src/engine/ticker.cpp index 8fb41408..0af9e28b 100644 --- a/src/engine/ticker.cpp +++ b/src/engine/ticker.cpp @@ -71,7 +71,7 @@ private: /* Entity management */ array DEPRECATED_m_todolist, DEPRECATED_m_todolist_delayed, DEPRECATED_m_autolist; array DEPRECATED_m_list[(int)tickable::group::all::end]; - array DEPRECATED_m_scenes[(int)tickable::group::all::end]; + std::vector DEPRECATED_m_scenes[(int)tickable::group::all::end]; int DEPRECATED_nentities = 0; /* Fixed framerate management */ @@ -297,11 +297,11 @@ void ticker_data::GameThreadTick() data->DEPRECATED_m_list[(int)e->m_gamegroup].push(e); if (e->m_drawgroup != tickable::group::draw::none) { - if (data->DEPRECATED_m_scenes[(int)e->m_drawgroup].count() < Scene::GetCount()) + if (data->DEPRECATED_m_scenes[(int)e->m_drawgroup].size() < Scene::GetCount()) data->DEPRECATED_m_scenes[(int)e->m_drawgroup].resize(Scene::GetCount()); int added_count = 0; - for (int i = 0; i < Scene::GetCount(); i++) + for (size_t i = 0; i < Scene::GetCount(); i++) { //If entity is concerned by this scene, add it in the list if (Scene::GetScene(i).IsRelevant(e)) @@ -396,7 +396,7 @@ void ticker_data::DrawThreadTick() } /* Render each scene one after the other */ - for (int idx = 0; idx < Scene::GetCount() && !data->m_quit /* Stop as soon as required */; ++idx) + for (size_t idx = 0; idx < Scene::GetCount() && !data->m_quit /* Stop as soon as required */; ++idx) { Scene& scene = Scene::GetScene(idx); @@ -519,7 +519,7 @@ void ticker_data::collect_garbage() if (g >= (int)tickable::group::game::end) { int removal_count = 0; - for (int j = 0; j < Scene::GetCount(); j++) + for (size_t j = 0; j < Scene::GetCount(); j++) { // If entity is concerned by this scene, add it in the list if (Scene::GetScene(j).IsRelevant(e)) diff --git a/src/image/resource.cpp b/src/image/resource.cpp index 55ac2fb3..eda0264a 100644 --- a/src/image/resource.cpp +++ b/src/image/resource.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright © 2010—2018 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // Copyright © 2016—2017 Benjamin “Touky” Huet // // Lol Engine is free software. It comes without any warranty, to diff --git a/src/mesh/primitivemesh.cpp b/src/mesh/primitivemesh.cpp index b8a8c123..6cbc4415 100644 --- a/src/mesh/primitivemesh.cpp +++ b/src/mesh/primitivemesh.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it diff --git a/src/sys/file.cpp b/src/sys/file.cpp index a9cb540d..6938f248 100644 --- a/src/sys/file.cpp +++ b/src/sys/file.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it diff --git a/src/sys/init.cpp b/src/sys/init.cpp index 0bfd1faf..43d19c33 100644 --- a/src/sys/init.cpp +++ b/src/sys/init.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it diff --git a/src/tileset.h b/src/tileset.h index 94152adf..adad8876 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright © 2010—2019 Sam Hocevar +// Copyright © 2010—2020 Sam Hocevar // // Lol Engine is free software. It comes without any warranty, to // the extent permitted by applicable law. You can redistribute it