diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/main-impl.cpp | 2 | ||||
-rw-r--r-- | main/main-impl.hpp | 8 | ||||
-rw-r--r-- | main/setup.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/main/main-impl.cpp b/main/main-impl.cpp index 4fe5d702..ae074a49 100644 --- a/main/main-impl.cpp +++ b/main/main-impl.cpp @@ -15,7 +15,7 @@ main_impl::~main_impl() noexcept } void main_impl::quit(int status) { Platform::Sdl2Application::exit(status); } -struct world& main_impl::world() noexcept { return _world; } +class world& main_impl::world() noexcept { return _world; } SDL_Window* main_impl::window() noexcept { return Sdl2Application::window(); } fm_settings& main_impl::settings() noexcept { return s; } const fm_settings& main_impl::settings() const noexcept { return s; } diff --git a/main/main-impl.hpp b/main/main-impl.hpp index 8aaf6312..b6d1b1f4 100644 --- a/main/main-impl.hpp +++ b/main/main-impl.hpp @@ -53,9 +53,9 @@ struct main_impl final : Platform::Sdl2Application, floormat_main struct lightmap_shader& lightmap_shader() noexcept override; - struct world& world() noexcept override; - struct world& reset_world() noexcept override; - struct world& reset_world(struct world&& w) noexcept override; + class world& world() noexcept override; + class world& reset_world() noexcept override; + class world& reset_world(class world&& w) noexcept override; SDL_Window* window() noexcept override; fm_settings& settings() noexcept override; @@ -108,7 +108,7 @@ private: tile_shader _shader; struct lightmap_shader _lightmap_shader{_tuc}; std::vector<clickable> _clickable_scenery; - struct world _world{}; + class world _world{}; Magnum::Timeline timeline; uint32_t _mouse_cursor = (uint32_t)-1; ground_mesh _ground_mesh; diff --git a/main/setup.cpp b/main/setup.cpp index 45f941cb..6f794719 100644 --- a/main/setup.cpp +++ b/main/setup.cpp @@ -103,12 +103,12 @@ auto main_impl::meshes() noexcept -> struct meshes return { _ground_mesh, _wall_mesh, _anim_mesh, }; }; -struct world& main_impl::reset_world() noexcept +class world& main_impl::reset_world() noexcept { return reset_world(floormat::world{}); } -struct world& main_impl::reset_world(struct world&& w) noexcept +class world& main_impl::reset_world(class world&& w) noexcept { _clickable_scenery.clear(); _world = std::move(w); |