Cleanup math with qfengine ports again

2 files changed, 3 insertions, 6 deletions

diff --git a/core/resource/image.cc b/core/resource/image.cc
index 45fe96e..8c83c55 100644
--- a/core/resource/image.cc
+++ b/core/resource/image.cc
@@ -4,7 +4,7 @@
 

 #include "core/resource/resource.hh"

 

-#include "core/utils/physfs.hh"

+#include "core/io/physfs.hh"

 

 static int stbi_physfs_read(void* context, char* data, int size)

 {

@@ -36,7 +36,7 @@ static const void* image_load_func(const char* name, std::uint32_t flags)
     auto file = PHYSFS_openRead(name);

 

     if(file == nullptr) {

-        spdlog::error("image: {}: {}", name, utils::physfs_error());

+        spdlog::error("image: {}: {}", name, io::physfs_error());

         return nullptr;

     }

 

diff --git a/core/resource/resource.cc b/core/resource/resource.cc
index 21d1e4e..7ca2ef9 100644
--- a/core/resource/resource.cc
+++ b/core/resource/resource.cc
@@ -10,10 +10,7 @@ struct ResourceLoader final {
     std::string class_name;

 };

 

-namespace

-{

-emhash8::HashMap<std::type_index, std::unique_ptr<ResourceLoader>> loaders;

-} // namespace

+static emhash8::HashMap<std::type_index, std::unique_ptr<ResourceLoader>> loaders;

 

 void resource::detail::register_loader(const std::type_info& type, ResourceLoadFunc load_func, ResourceFreeFunc free_func)

 {