summaryrefslogtreecommitdiffhomepage
path: root/loader/loader.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-02-09 19:34:15 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-02-09 20:08:55 +0100
commitd0395f8468b33817a79a0fd625ae52cdff06ae19 (patch)
tree1751e2e0771cb231fc143aebd7df3c1e72334beb /loader/loader.hpp
parentd30921ac0b361639c10ae9d337cbf16cc3b7d359 (diff)
loader: move vobj_cell to its own file
Diffstat (limited to 'loader/loader.hpp')
-rw-r--r--loader/loader.hpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/loader/loader.hpp b/loader/loader.hpp
index 452b6fcc..23a9ddf3 100644
--- a/loader/loader.hpp
+++ b/loader/loader.hpp
@@ -18,19 +18,13 @@ struct anim_def;
class anim_atlas;
struct anim_cell;
struct scenery_proto;
-struct vobj_info;
+struct vobj_cell;
class ground_atlas;
struct ground_cell;
struct wall_cell;
class wall_atlas;
struct scenery_proto;
-struct vobj_info final
-{
- String name, descr;
- std::shared_ptr<anim_atlas> atlas;
-};
-
struct loader_
{
virtual StringView shader(StringView filename) noexcept = 0;
@@ -48,8 +42,8 @@ struct loader_
virtual const scenery_proto& scenery(StringView name) noexcept(false) = 0;
virtual StringView startup_directory() noexcept = 0;
static StringView strip_prefix(StringView name);
- virtual const vobj_info& vobj(StringView name) = 0;
- virtual ArrayView<const struct vobj_info> vobj_list() = 0;
+ virtual const vobj_cell& vobj(StringView name) = 0;
+ virtual ArrayView<const struct vobj_cell> vobj_list() = 0;
static StringView make_atlas_path(char(&buf)[fm_FILENAME_MAX], StringView dir, StringView name);
[[nodiscard]] static bool check_atlas_name(StringView name) noexcept;