From d0395f8468b33817a79a0fd625ae52cdff06ae19 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 9 Feb 2024 19:34:15 +0100 Subject: loader: move vobj_cell to its own file --- loader/vobj.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'loader/vobj.cpp') diff --git a/loader/vobj.cpp b/loader/vobj.cpp index 5f7fc2fe..d437df69 100644 --- a/loader/vobj.cpp +++ b/loader/vobj.cpp @@ -4,6 +4,7 @@ #include "src/anim-atlas.hpp" #include "src/anim.hpp" #include "compat/exception.hpp" +#include "loader/vobj-cell.hpp" #include #include #include @@ -89,7 +90,7 @@ void loader_impl::get_vobj_list() for (const auto& [name, descr, img_name] : vec) { auto atlas = make_vobj_anim_atlas(name, img_name); - auto info = vobj_info{name, descr, atlas}; + auto info = vobj_cell{name, descr, atlas}; vobjs.push_back(std::move(info)); const auto& x = vobjs.back(); vobj_atlas_map[x.atlas->name()] = &x; @@ -98,7 +99,7 @@ void loader_impl::get_vobj_list() fm_assert(!vobjs.empty()); } -ArrayView loader_impl::vobj_list() +ArrayView loader_impl::vobj_list() { if (vobjs.empty()) get_vobj_list(); @@ -106,7 +107,7 @@ ArrayView loader_impl::vobj_list() return vobjs; } -const struct vobj_info& loader_impl::vobj(StringView name) +const struct vobj_cell& loader_impl::vobj(StringView name) { if (vobjs.empty()) get_vobj_list(); -- cgit v1.2.3