Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarSystemWorldServer.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-02-20 09:49:42 +1100
committerGitHub <noreply@github.com>2024-02-20 09:49:42 +1100
commitaa987a217779e71f97ee4c9cce531aec1c861bf8 (patch)
treee51fcce110306d93bf93870f13a5ff7d6b575427 /source/game/StarSystemWorldServer.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarSystemWorldServer.cpp')
-rw-r--r--source/game/StarSystemWorldServer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarSystemWorldServer.cpp b/source/game/StarSystemWorldServer.cpp
index 39a1aad..3b847eb 100644
--- a/source/game/StarSystemWorldServer.cpp
+++ b/source/game/StarSystemWorldServer.cpp
@@ -10,8 +10,8 @@
namespace Star {
SystemWorldServer::SystemWorldServer(Vec3I location, ClockConstPtr universeClock, CelestialDatabasePtr celestialDatabase)
- : SystemWorld(move(universeClock), move(celestialDatabase)) {
- m_location = move(location);
+ : SystemWorld(std::move(universeClock), std::move(celestialDatabase)) {
+ m_location = std::move(location);
placeInitialObjects();
@@ -21,7 +21,7 @@ SystemWorldServer::SystemWorldServer(Vec3I location, ClockConstPtr universeClock
}
SystemWorldServer::SystemWorldServer(Json const& diskStore, ClockConstPtr universeClock, CelestialDatabasePtr celestialDatabase)
- : SystemWorld(move(universeClock), move(celestialDatabase)) {
+ : SystemWorld(std::move(universeClock), std::move(celestialDatabase)) {
m_location = jsonToVec3I(diskStore.get("location"));
for (auto objectStore : diskStore.getArray("objects")) {