summaryrefslogtreecommitdiffhomepage
path: root/loader
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-01-08 06:44:58 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-01-08 06:44:58 +0100
commit98c557e46b2caa02c000721a3ef5a85c955fbeda (patch)
treecbc385881c244364e8b4b996ae5c6b954fc0a190 /loader
parent7f42651fdd5a7d575ffdde89c369fe28cad2ced5 (diff)
a
Diffstat (limited to 'loader')
-rw-r--r--loader/atlas.cpp2
-rw-r--r--loader/wall-atlas.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/loader/atlas.cpp b/loader/atlas.cpp
index 94f02e3c..68a94f0b 100644
--- a/loader/atlas.cpp
+++ b/loader/atlas.cpp
@@ -34,7 +34,7 @@ bool loader_::check_atlas_name(StringView str) noexcept
return true;
if (!str || !first_char.find(str[0]))
return false;
- if (str.findAny("\\\"'\n\r\t\a\033\0|$!%{}^*?<>&;:^"_s) || str.find("/."_s))
+ if (str.findAny("\\\"'\n\r\t\a\033\0|$!%{}^*?<>&;:^"_s) || str.find("/."_s) || str.find("//"_s))
return false;
return true;
diff --git a/loader/wall-atlas.cpp b/loader/wall-atlas.cpp
index c28f71a1..1e63a6c9 100644
--- a/loader/wall-atlas.cpp
+++ b/loader/wall-atlas.cpp
@@ -142,7 +142,7 @@ void loader_impl::get_wall_atlas_list()
ArrayView<const wall_info> loader_impl::wall_atlas_list()
{
- if (wall_atlas_map.empty())
+ if (wall_atlas_map.empty()) [[unlikely]]
get_wall_atlas_list();
fm_assert(!wall_atlas_map.empty());
return wall_atlas_array;