Replace most of C strings with string_view

3 files changed, 5 insertions, 5 deletions

diff --git a/game/server/world/overworld.cc b/game/server/world/overworld.cc
index ff0b6f7..fca3edf 100644
--- a/game/server/world/overworld.cc
+++ b/game/server/world/overworld.cc
@@ -70,7 +70,7 @@ static void compute_tree_feature(unsigned int height, world::Feature& feature, v
     }
 }
 
-world::Overworld::Overworld(const char* name) : Dimension(name, -30.0f)
+world::Overworld::Overworld(std::string_view name) : Dimension(name, -30.0f)
 {
     m_bottommost_chunk.set_limits(-64, -4);
     m_terrain_variation.set_limits(16, 256);
diff --git a/game/server/world/overworld.hh b/game/server/world/overworld.hh
index 4141105..3da0401 100644
--- a/game/server/world/overworld.hh
+++ b/game/server/world/overworld.hh
@@ -25,7 +25,7 @@ namespace world
 {
 class Overworld final : public Dimension {
 public:
-    explicit Overworld(const char* name);
+    explicit Overworld(std::string_view name);
     virtual ~Overworld(void) = default;
 
 public:
diff --git a/game/server/world/universe.cc b/game/server/world/universe.cc
index 9b031ca..fe840da 100644
--- a/game/server/world/universe.cc
+++ b/game/server/world/universe.cc
@@ -41,7 +41,7 @@ static std::string make_chunk_filename(const DimensionMetadata* metadata, const
 
 static void add_new_dimension(world::Dimension* dimension)
 {
-    if(globals::dimensions.count(dimension->get_name())) {
+    if(globals::dimensions.count(std::string(dimension->get_name()))) {
         spdlog::critical("universe: dimension named {} already exists", dimension->get_name());
         std::terminate();
     }
@@ -62,7 +62,7 @@ static void add_new_dimension(world::Dimension* dimension)
         std::terminate();
     }
 
-    globals::dimensions.insert_or_assign(dimension->get_name(), dimension);
+    globals::dimensions.insert_or_assign(std::string(dimension->get_name()), dimension);
 
     auto& mapped_metadata = metadata_map.insert_or_assign(dimension, metadata).first->second;
 
@@ -122,7 +122,7 @@ void world::universe::init_late(void)
         std::terminate();
     }
 
-    auto spawn_dimension = globals::dimensions.find(universe_spawn_dimension.get());
+    auto spawn_dimension = globals::dimensions.find(universe_spawn_dimension.get_value());
 
     if(spawn_dimension == globals::dimensions.cend()) {
         spdlog::critical("universe: {} is not a valid dimension name", universe_spawn_dimension.get());