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

summaryrefslogtreecommitdiff
path: root/source/game
diff options
context:
space:
mode:
Diffstat (limited to 'source/game')
-rw-r--r--source/game/StarBehaviorState.cpp8
-rw-r--r--source/game/StarCollectionDatabase.cpp6
-rw-r--r--source/game/StarDrawable.cpp6
-rw-r--r--source/game/StarNetPackets.cpp151
-rw-r--r--source/game/StarNpcDatabase.cpp2
-rw-r--r--source/game/StarRoot.cpp6
-rw-r--r--source/game/StarSystemWorld.cpp2
-rw-r--r--source/game/StarToolUser.cpp2
-rw-r--r--source/game/StarWorldClient.cpp6
-rw-r--r--source/game/StarWorldParameters.cpp5
-rw-r--r--source/game/StarWorldParameters.hpp2
-rw-r--r--source/game/StarWorldServer.cpp2
-rw-r--r--source/game/items/StarInspectionTool.hpp4
13 files changed, 102 insertions, 100 deletions
diff --git a/source/game/StarBehaviorState.cpp b/source/game/StarBehaviorState.cpp
index b27a076..5308f3a 100644
--- a/source/game/StarBehaviorState.cpp
+++ b/source/game/StarBehaviorState.cpp
@@ -209,7 +209,7 @@ NodeStatus BehaviorState::runAction(ActionNode const& node, NodeState& state) {
LuaThread thread = nodeLuaThread(node.name);
try {
result = thread.resume<ActionReturn>(parameters, blackboardPtr(), id, m_lastDt).value(ActionReturn(NodeStatus::Invalid, LuaNil));
- } catch (LuaException e) {
+ } catch (LuaException const& e) {
throw StarException(strf("Lua Exception caught running action node %s in behavior %s: %s", node.name, m_tree->name, outputException(e, false)));
}
@@ -221,7 +221,7 @@ NodeStatus BehaviorState::runAction(ActionNode const& node, NodeState& state) {
try {
result = thread.resume<ActionReturn>(m_lastDt).value(ActionReturn(NodeStatus::Invalid, LuaNil));
- } catch (LuaException e) {
+ } catch (LuaException const& e) {
throw StarException(strf("Lua Exception caught resuming action node %s in behavior %s: %s", node.name, m_tree->name, outputException(e, false)));
}
@@ -245,7 +245,7 @@ NodeStatus BehaviorState::runDecorator(DecoratorNode const& node, NodeState& sta
LuaThread thread = nodeLuaThread(node.name);
try {
status = thread.resume<NodeStatus>(parameters, blackboardPtr(), id).value(NodeStatus::Invalid);
- } catch (LuaException e) {
+ } catch (LuaException const& e) {
throw StarException(strf("Lua Exception caught initializing decorator node %s in behavior %s: %s", node.name, m_tree->name, outputException(e, false)));
}
if (status == NodeStatus::Success || status == NodeStatus::Failure)
@@ -261,7 +261,7 @@ NodeStatus BehaviorState::runDecorator(DecoratorNode const& node, NodeState& sta
if (childStatus == NodeStatus::Success || childStatus == NodeStatus::Failure) {
try {
status = decorator.thread.resume<NodeStatus>(childStatus).value(NodeStatus::Invalid);
- } catch (LuaException e) {
+ } catch (LuaException const& e) {
throw StarException(strf("Lua Exception caught resuming decorator node %s in behavior %s: %s", node.name, m_tree->name, outputException(e, false)));
}
} else {
diff --git a/source/game/StarCollectionDatabase.cpp b/source/game/StarCollectionDatabase.cpp
index 1f6d84d..c407278 100644
--- a/source/game/StarCollectionDatabase.cpp
+++ b/source/game/StarCollectionDatabase.cpp
@@ -58,7 +58,7 @@ List<Collection> CollectionDatabase::collections() const {
Collection CollectionDatabase::collection(String const& collectionName) const {
try {
return m_collections.get(collectionName);
- } catch (MapException e) {
+ } catch (MapException const& e) {
throw CollectionDatabaseException(strf("Collection '%s' not found", collectionName), e);
}
}
@@ -66,7 +66,7 @@ Collection CollectionDatabase::collection(String const& collectionName) const {
List<Collectable> CollectionDatabase::collectables(String const& collectionName) const {
try {
return m_collectables.get(collectionName).values();
- } catch (MapException e) {
+ } catch (MapException const& e) {
throw CollectionDatabaseException(strf("Collection '%s' not found", collectionName), e);
}
}
@@ -74,7 +74,7 @@ List<Collectable> CollectionDatabase::collectables(String const& collectionName)
Collectable CollectionDatabase::collectable(String const& collectionName, String const& collectableName) const {
try {
return m_collectables.get(collectionName).get(collectableName);
- } catch (MapException e) {
+ } catch (MapException const& e) {
throw CollectionDatabaseException(strf("Collectable '%s' not found in collection '%s'", collectableName, collectionName), e);
}
}
diff --git a/source/game/StarDrawable.cpp b/source/game/StarDrawable.cpp
index 90b36c5..c7311ae 100644
--- a/source/game/StarDrawable.cpp
+++ b/source/game/StarDrawable.cpp
@@ -154,7 +154,7 @@ Json Drawable::toJson() const {
json.set("color", jsonFromColor(color));
json.set("fullbright", fullbright);
- return move(json);
+ return json;
}
void Drawable::translate(Vec2F const& translation) {
@@ -270,13 +270,13 @@ DataStream& operator<<(DataStream& ds, Drawable::PolyPart const& poly) {
// I need to find out if this is for network serialization or not eventually
DataStream& operator>>(DataStream& ds, Drawable::ImagePart& image) {
- ds >> AssetPath::join(image.image);
+ ds >> image.image;
ds >> image.transformation;
return ds;
}
DataStream& operator<<(DataStream& ds, Drawable::ImagePart const& image) {
- ds << AssetPath::join(image.image);
+ ds << image.image;
ds << image.transformation;
return ds;
}
diff --git a/source/game/StarNetPackets.cpp b/source/game/StarNetPackets.cpp
index 327dc4a..e6c856b 100644
--- a/source/game/StarNetPackets.cpp
+++ b/source/game/StarNetPackets.cpp
@@ -77,87 +77,82 @@ EnumMap<PacketType> const PacketTypeNames{
{PacketType::SystemObjectSpawn, "SystemObjectSpawn"}
};
-typedef decltype(&make_shared<Packet>) PacketMakePtr;
-Array<PacketMakePtr, 69> const PacketTypeMakers = {
- (PacketMakePtr)&make_shared<ProtocolRequestPacket>,
- (PacketMakePtr)&make_shared<ProtocolResponsePacket>,
- (PacketMakePtr)&make_shared<ServerDisconnectPacket>,
- (PacketMakePtr)&make_shared<ConnectSuccessPacket>,
- (PacketMakePtr)&make_shared<ConnectFailurePacket>,
- (PacketMakePtr)&make_shared<HandshakeChallengePacket>,
- (PacketMakePtr)&make_shared<ChatReceivePacket>,
- (PacketMakePtr)&make_shared<UniverseTimeUpdatePacket>,
- (PacketMakePtr)&make_shared<CelestialResponsePacket>,
- (PacketMakePtr)&make_shared<PlayerWarpResultPacket>,
- (PacketMakePtr)&make_shared<PlanetTypeUpdatePacket>,
- (PacketMakePtr)&make_shared<PausePacket>,
- (PacketMakePtr)&make_shared<ServerInfoPacket>,
- (PacketMakePtr)&make_shared<ClientConnectPacket>,
- (PacketMakePtr)&make_shared<ClientDisconnectRequestPacket>,
- (PacketMakePtr)&make_shared<HandshakeResponsePacket>,
- (PacketMakePtr)&make_shared<PlayerWarpPacket>,
- (PacketMakePtr)&make_shared<FlyShipPacket>,
- (PacketMakePtr)&make_shared<ChatSendPacket>,
- (PacketMakePtr)&make_shared<CelestialRequestPacket>,
- (PacketMakePtr)&make_shared<ClientContextUpdatePacket>,
- (PacketMakePtr)&make_shared<WorldStartPacket>,
- (PacketMakePtr)&make_shared<WorldStopPacket>,
- (PacketMakePtr)&make_shared<WorldLayoutUpdatePacket>,
- (PacketMakePtr)&make_shared<WorldParametersUpdatePacket>,
- (PacketMakePtr)&make_shared<CentralStructureUpdatePacket>,
- (PacketMakePtr)&make_shared<TileArrayUpdatePacket>,
- (PacketMakePtr)&make_shared<TileUpdatePacket>,
- (PacketMakePtr)&make_shared<TileLiquidUpdatePacket>,
- (PacketMakePtr)&make_shared<TileDamageUpdatePacket>,
- (PacketMakePtr)&make_shared<TileModificationFailurePacket>,
- (PacketMakePtr)&make_shared<GiveItemPacket>,
- (PacketMakePtr)&make_shared<EnvironmentUpdatePacket>,
- (PacketMakePtr)&make_shared<UpdateTileProtectionPacket>,
- (PacketMakePtr)&make_shared<SetDungeonGravityPacket>,
- (PacketMakePtr)&make_shared<SetDungeonBreathablePacket>,
- (PacketMakePtr)&make_shared<SetPlayerStartPacket>,
- (PacketMakePtr)&make_shared<FindUniqueEntityResponsePacket>,
- (PacketMakePtr)&make_shared<PongPacket>,
- (PacketMakePtr)&make_shared<ModifyTileListPacket>,
- (PacketMakePtr)&make_shared<DamageTileGroupPacket>,
- (PacketMakePtr)&make_shared<CollectLiquidPacket>,
- (PacketMakePtr)&make_shared<RequestDropPacket>,
- (PacketMakePtr)&make_shared<SpawnEntityPacket>,
- (PacketMakePtr)&make_shared<ConnectWirePacket>,
- (PacketMakePtr)&make_shared<DisconnectAllWiresPacket>,
- (PacketMakePtr)&make_shared<WorldClientStateUpdatePacket>,
- (PacketMakePtr)&make_shared<FindUniqueEntityPacket>,
- (PacketMakePtr)&make_shared<WorldStartAcknowledgePacket>,
- (PacketMakePtr)&make_shared<PingPacket>,
- (PacketMakePtr)&make_shared<EntityCreatePacket>,
- (PacketMakePtr)&make_shared<EntityUpdateSetPacket>,
- (PacketMakePtr)&make_shared<EntityDestroyPacket>,
- (PacketMakePtr)&make_shared<EntityInteractPacket>,
- (PacketMakePtr)&make_shared<EntityInteractResultPacket>,
- (PacketMakePtr)&make_shared<HitRequestPacket>,
- (PacketMakePtr)&make_shared<DamageRequestPacket>,
- (PacketMakePtr)&make_shared<DamageNotificationPacket>,
- (PacketMakePtr)&make_shared<EntityMessagePacket>,
- (PacketMakePtr)&make_shared<EntityMessageResponsePacket>,
- (PacketMakePtr)&make_shared<UpdateWorldPropertiesPacket>,
- (PacketMakePtr)&make_shared<StepUpdatePacket>,
- (PacketMakePtr)&make_shared<SystemWorldStartPacket>,
- (PacketMakePtr)&make_shared<SystemWorldUpdatePacket>,
- (PacketMakePtr)&make_shared<SystemObjectCreatePacket>,
- (PacketMakePtr)&make_shared<SystemObjectDestroyPacket>,
- (PacketMakePtr)&make_shared<SystemShipCreatePacket>,
- (PacketMakePtr)&make_shared<SystemShipDestroyPacket>,
- (PacketMakePtr)&make_shared<SystemObjectSpawnPacket>
-};
-
Packet::~Packet() {}
PacketPtr createPacket(PacketType type) {
- unsigned i = (unsigned)type;
- if (i < PacketTypeMakers.size())
- return PacketTypeMakers[i]();
- else
- throw StarPacketException(strf("Unrecognized packet type %s", i));
+ switch (type) {
+ case PacketType::ProtocolRequest: return make_shared<ProtocolRequestPacket>();
+ case PacketType::ProtocolResponse: return make_shared<ProtocolResponsePacket>();
+ case PacketType::ServerDisconnect: return make_shared<ServerDisconnectPacket>();
+ case PacketType::ConnectSuccess: return make_shared<ConnectSuccessPacket>();
+ case PacketType::ConnectFailure: return make_shared<ConnectFailurePacket>();
+ case PacketType::HandshakeChallenge: return make_shared<HandshakeChallengePacket>();
+ case PacketType::ChatReceive: return make_shared<ChatReceivePacket>();
+ case PacketType::UniverseTimeUpdate: return make_shared<UniverseTimeUpdatePacket>();
+ case PacketType::CelestialResponse: return make_shared<CelestialResponsePacket>();
+ case PacketType::PlayerWarpResult: return make_shared<PlayerWarpResultPacket>();
+ case PacketType::PlanetTypeUpdate: return make_shared<PlanetTypeUpdatePacket>();
+ case PacketType::Pause: return make_shared<PausePacket>();
+ case PacketType::ServerInfo: return make_shared<ServerInfoPacket>();
+ case PacketType::ClientConnect: return make_shared<ClientConnectPacket>();
+ case PacketType::ClientDisconnectRequest: return make_shared<ClientDisconnectRequestPacket>();
+ case PacketType::HandshakeResponse: return make_shared<HandshakeResponsePacket>();
+ case PacketType::PlayerWarp: return make_shared<PlayerWarpPacket>();
+ case PacketType::FlyShip: return make_shared<FlyShipPacket>();
+ case PacketType::ChatSend: return make_shared<ChatSendPacket>();
+ case PacketType::CelestialRequest: return make_shared<CelestialRequestPacket>();
+ case PacketType::ClientContextUpdate: return make_shared<ClientContextUpdatePacket>();
+ case PacketType::WorldStart: return make_shared<WorldStartPacket>();
+ case PacketType::WorldStop: return make_shared<WorldStopPacket>();
+ case PacketType::WorldLayoutUpdate: return make_shared<WorldLayoutUpdatePacket>();
+ case PacketType::WorldParametersUpdate: return make_shared<WorldParametersUpdatePacket>();
+ case PacketType::CentralStructureUpdate: return make_shared<CentralStructureUpdatePacket>();
+ case PacketType::TileArrayUpdate: return make_shared<TileArrayUpdatePacket>();
+ case PacketType::TileUpdate: return make_shared<TileUpdatePacket>();
+ case PacketType::TileLiquidUpdate: return make_shared<TileLiquidUpdatePacket>();
+ case PacketType::TileDamageUpdate: return make_shared<TileDamageUpdatePacket>();
+ case PacketType::TileModificationFailure: return make_shared<TileModificationFailurePacket>();
+ case PacketType::GiveItem: return make_shared<GiveItemPacket>();
+ case PacketType::EnvironmentUpdate: return make_shared<EnvironmentUpdatePacket>();
+ case PacketType::UpdateTileProtection: return make_shared<UpdateTileProtectionPacket>();
+ case PacketType::SetDungeonGravity: return make_shared<SetDungeonGravityPacket>();
+ case PacketType::SetDungeonBreathable: return make_shared<SetDungeonBreathablePacket>();
+ case PacketType::SetPlayerStart: return make_shared<SetPlayerStartPacket>();
+ case PacketType::FindUniqueEntityResponse: return make_shared<FindUniqueEntityResponsePacket>();
+ case PacketType::Pong: return make_shared<PongPacket>();
+ case PacketType::ModifyTileList: return make_shared<ModifyTileListPacket>();
+ case PacketType::DamageTileGroup: return make_shared<DamageTileGroupPacket>();
+ case PacketType::CollectLiquid: return make_shared<CollectLiquidPacket>();
+ case PacketType::RequestDrop: return make_shared<RequestDropPacket>();
+ case PacketType::SpawnEntity: return make_shared<SpawnEntityPacket>();
+ case PacketType::ConnectWire: return make_shared<ConnectWirePacket>();
+ case PacketType::DisconnectAllWires: return make_shared<DisconnectAllWiresPacket>();
+ case PacketType::WorldClientStateUpdate: return make_shared<WorldClientStateUpdatePacket>();
+ case PacketType::FindUniqueEntity: return make_shared<FindUniqueEntityPacket>();
+ case PacketType::WorldStartAcknowledge: return make_shared<WorldStartAcknowledgePacket>();
+ case PacketType::Ping: return make_shared<PingPacket>();
+ case PacketType::EntityCreate: return make_shared<EntityCreatePacket>();
+ case PacketType::EntityUpdateSet: return make_shared<EntityUpdateSetPacket>();
+ case PacketType::EntityDestroy: return make_shared<EntityDestroyPacket>();
+ case PacketType::EntityInteract: return make_shared<EntityInteractPacket>();
+ case PacketType::EntityInteractResult: return make_shared<EntityInteractResultPacket>();
+ case PacketType::HitRequest: return make_shared<HitRequestPacket>();
+ case PacketType::DamageRequest: return make_shared<DamageRequestPacket>();
+ case PacketType::DamageNotification: return make_shared<DamageNotificationPacket>();
+ case PacketType::EntityMessage: return make_shared<EntityMessagePacket>();
+ case PacketType::EntityMessageResponse: return make_shared<EntityMessageResponsePacket>();
+ case PacketType::UpdateWorldProperties: return make_shared<UpdateWorldPropertiesPacket>();
+ case PacketType::StepUpdate: return make_shared<StepUpdatePacket>();
+ case PacketType::SystemWorldStart: return make_shared<SystemWorldStartPacket>();
+ case PacketType::SystemWorldUpdate: return make_shared<SystemWorldUpdatePacket>();
+ case PacketType::SystemObjectCreate: return make_shared<SystemObjectCreatePacket>();
+ case PacketType::SystemObjectDestroy: return make_shared<SystemObjectDestroyPacket>();
+ case PacketType::SystemShipCreate: return make_shared<SystemShipCreatePacket>();
+ case PacketType::SystemShipDestroy: return make_shared<SystemShipDestroyPacket>();
+ case PacketType::SystemObjectSpawn: return make_shared<SystemObjectSpawnPacket>();
+ default:
+ throw StarPacketException(strf("Unrecognized packet type %s", (unsigned int)type));
+ }
}
ProtocolRequestPacket::ProtocolRequestPacket()
diff --git a/source/game/StarNpcDatabase.cpp b/source/game/StarNpcDatabase.cpp
index 2af5511..dd0a5fc 100644
--- a/source/game/StarNpcDatabase.cpp
+++ b/source/game/StarNpcDatabase.cpp
@@ -383,7 +383,7 @@ Json NpcDatabase::mergeConfigValues(Json const& base, Json const& merger) const
map[entry.first] = mergeConfigValues(map[entry.first], entry.second);
}
}
- return std::move(map);
+ return map;
} else if (merger.isNull()) {
return base;
} else {
diff --git a/source/game/StarRoot.cpp b/source/game/StarRoot.cpp
index 6d23a67..8758447 100644
--- a/source/game/StarRoot.cpp
+++ b/source/game/StarRoot.cpp
@@ -550,7 +550,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
String path;
Maybe<String> name;
float priority;
- StringList requires;
+ StringList requires_;
StringList includes;
};
List<shared_ptr<AssetSource>> assetSources;
@@ -589,7 +589,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
assetSource->path = fileName;
assetSource->name = metadata.maybe("name").apply(mem_fn(&Json::toString));
assetSource->priority = metadata.value("priority", 0.0f).toFloat();
- assetSource->requires = jsonToStringList(metadata.value("requires", JsonArray{}));
+ assetSource->requires_ = jsonToStringList(metadata.value("requires", JsonArray{}));
assetSource->includes = jsonToStringList(metadata.value("includes", JsonArray{}));
if (assetSource->name) {
@@ -640,7 +640,7 @@ StringList Root::scanForAssetSources(StringList const& directories) {
dependencySortVisit(*include);
}
- for (auto const& requirementName : source->requires) {
+ for (auto const& requirementName : source->requires_) {
if (auto requirement = namedSources.ptr(requirementName))
dependencySortVisit(*requirement);
else
diff --git a/source/game/StarSystemWorld.cpp b/source/game/StarSystemWorld.cpp
index 97f948d..e075b78 100644
--- a/source/game/StarSystemWorld.cpp
+++ b/source/game/StarSystemWorld.cpp
@@ -138,7 +138,7 @@ List<CelestialCoordinate> SystemWorld::planets() const {
uint64_t SystemWorld::coordinateSeed(CelestialCoordinate const& coordinate, String const& seedMix) const {
auto satellite = coordinate.isSatelliteBody() ? coordinate.orbitNumber() : 0;
- auto planet = coordinate.isSatelliteBody() ? coordinate.parent().orbitNumber() : coordinate.isPlanetaryBody() && coordinate.orbitNumber() || 0;
+ auto planet = coordinate.isSatelliteBody() ? coordinate.parent().orbitNumber() : (coordinate.isPlanetaryBody() && coordinate.orbitNumber()) || 0;
return staticRandomU64(coordinate.location()[0], coordinate.location()[1], coordinate.location()[2], planet, satellite, seedMix);
}
diff --git a/source/game/StarToolUser.cpp b/source/game/StarToolUser.cpp
index f3b4d5d..6c0cdf2 100644
--- a/source/game/StarToolUser.cpp
+++ b/source/game/StarToolUser.cpp
@@ -191,7 +191,7 @@ List<Drawable> ToolUser::renderObjectPreviews(Vec2F aimPosition, Direction walki
nearWhite.setValue(1 - (1 - nearWhite.value()) / 5);
nearWhite.setSaturation(nearWhite.saturation() / 5);
nearWhite.setAlphaF(m_objectPreviewInnerAlpha);
- ImageOperation op = BorderImageOperation{m_beamGunGlowBorder, nearWhite.toRgba(), favoriteColorTrans, false};
+ ImageOperation op = BorderImageOperation{m_beamGunGlowBorder, nearWhite.toRgba(), favoriteColorTrans, false, false};
for (Drawable& drawable : drawables) {
if (drawable.isImage())
diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp
index 6fa7709..f04c70a 100644
--- a/source/game/StarWorldClient.cpp
+++ b/source/game/StarWorldClient.cpp
@@ -358,7 +358,7 @@ void WorldClient::render(WorldRenderData& renderData, unsigned bufferTiles) {
const List<Directives>* directives = nullptr;
if (auto& worldTemplate = m_worldTemplate) {
- if (auto& parameters = worldTemplate->worldParameters())
+ if (const auto& parameters = worldTemplate->worldParameters())
if (auto& globalDirectives = m_worldTemplate->worldParameters()->globalDirectives)
directives = &globalDirectives.get();
}
@@ -1266,7 +1266,7 @@ void WorldClient::handleDamageNotifications() {
const List<Directives>* directives = nullptr;
if (auto& worldTemplate = m_worldTemplate) {
- if (auto& parameters = worldTemplate->worldParameters())
+ if (const auto& parameters = worldTemplate->worldParameters())
if (auto& globalDirectives = m_worldTemplate->worldParameters()->globalDirectives)
directives = &globalDirectives.get();
}
@@ -1336,7 +1336,7 @@ void WorldClient::removeEntity(EntityId entityId, bool andDie) {
const List<Directives>* directives = nullptr;
if (auto& worldTemplate = m_worldTemplate) {
- if (auto& parameters = worldTemplate->worldParameters())
+ if (const auto& parameters = worldTemplate->worldParameters())
if (auto& globalDirectives = m_worldTemplate->worldParameters()->globalDirectives)
directives = &globalDirectives.get();
}
diff --git a/source/game/StarWorldParameters.cpp b/source/game/StarWorldParameters.cpp
index 343e294..c12c18e 100644
--- a/source/game/StarWorldParameters.cpp
+++ b/source/game/StarWorldParameters.cpp
@@ -161,6 +161,11 @@ TerrestrialWorldParameters::TerrestrialWorldParameters(Json const& store) : Visi
coreLayer = loadTerrestrialLayer(store.get("coreLayer"));
}
+TerrestrialWorldParameters &TerrestrialWorldParameters::operator=(TerrestrialWorldParameters const& terrestrialWorldParameters) {
+ *this = terrestrialWorldParameters;
+ return *this;
+}
+
WorldParametersType TerrestrialWorldParameters::type() const {
return WorldParametersType::TerrestrialWorldParameters;
}
diff --git a/source/game/StarWorldParameters.hpp b/source/game/StarWorldParameters.hpp
index 46f4f9c..3103278 100644
--- a/source/game/StarWorldParameters.hpp
+++ b/source/game/StarWorldParameters.hpp
@@ -107,6 +107,8 @@ struct TerrestrialWorldParameters : VisitableWorldParameters {
TerrestrialWorldParameters(TerrestrialWorldParameters const& terrestrialWorldParameters);
TerrestrialWorldParameters(Json const& store);
+ TerrestrialWorldParameters &operator=(TerrestrialWorldParameters const& terrestrialWorldParameters);
+
virtual WorldParametersType type() const override;
virtual Json store() const override;
diff --git a/source/game/StarWorldServer.cpp b/source/game/StarWorldServer.cpp
index a9b154e..33fa74c 100644
--- a/source/game/StarWorldServer.cpp
+++ b/source/game/StarWorldServer.cpp
@@ -1747,7 +1747,7 @@ void WorldServer::queueUpdatePackets(ConnectionId clientId) {
auto pair = make_pair(entityId, *version);
auto i = m_netStateCache.find(pair);
if (i == m_netStateCache.end())
- i = m_netStateCache.insert(pair, move(monitoredEntity->writeNetState(*version))).first;
+ i = m_netStateCache.insert(pair, monitoredEntity->writeNetState(*version)).first;
const auto& netState = i->second;
if (!netState.first.empty())
updateSetPacket->deltas[entityId] = netState.first;
diff --git a/source/game/items/StarInspectionTool.hpp b/source/game/items/StarInspectionTool.hpp
index d80e0a3..f50935c 100644
--- a/source/game/items/StarInspectionTool.hpp
+++ b/source/game/items/StarInspectionTool.hpp
@@ -19,8 +19,8 @@ public:
struct InspectionResult {
String message;
- Maybe<String> objectName;
- Maybe<EntityId> entityId;
+ Maybe<String> objectName = {};
+ Maybe<EntityId> entityId = {};
};
InspectionTool(Json const& config, String const& directory, Json const& parameters = JsonObject());
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-12 12:59:15 +0000