From 4e46a8101b2063457ac0c56770e58cd0bedf52ea Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 10 Dec 2023 17:08:15 +0100 Subject: w --- loader/wall-atlas.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'loader') diff --git a/loader/wall-atlas.cpp b/loader/wall-atlas.cpp index 23eb6e53..30afe3d9 100644 --- a/loader/wall-atlas.cpp +++ b/loader/wall-atlas.cpp @@ -56,17 +56,16 @@ const wall_info& loader_impl::make_invalid_wall_atlas() return *invalid_wall_atlas; constexpr auto name = ""_s; - constexpr auto size = Vector3ui{iTILE_SIZE}; - constexpr auto frame_size = Vector2ui{size.x(), size.z()}; + constexpr auto frame_size = Vector2ui{iTILE_SIZE.x(), iTILE_SIZE.z()}; auto a = std::make_shared( wall_atlas_def { - {.name = name, .depth = 8}, - { {{}, frame_size},}, - { { {.index = 0, .count = 1, .pixel_size = frame_size, } } }, - {{ {.val = 0}, {}, {}, {} }}, + Wall::Info{.name = name, .depth = 8}, + {{ {}, frame_size}, }, + {{ {.index = 0, .count = 1, .pixel_size = frame_size, } }}, + {{ {.val = 0}, {}, }}, {1u}, - }, name, make_error_texture()); + }, name, make_error_texture()); invalid_wall_atlas = Pointer{InPlaceInit, wall_info{ .name = name, .atlas = a } }; return *invalid_wall_atlas; } -- cgit v1.2.3