Address misc feedback

Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp

@@ -23,7 +23,7 @@ namespace Multiplayer
 {
     AZ_CVAR(AZ::TimeMs, cl_InputRateMs, AZ::TimeMs{ 33 }, nullptr, AZ::ConsoleFunctorFlags::Null, "Rate at which to sample and process client inputs");
     AZ_CVAR(AZ::TimeMs, cl_MaxRewindHistoryMs, AZ::TimeMs{ 2000 }, nullptr, AZ::ConsoleFunctorFlags::Null, "Maximum number of milliseconds to keep for server correction rewind and replay");
-#ifndef _RELEASE
+#ifndef AZ_RELEASE_BUILD
     AZ_CVAR(float, cl_DebugHackTimeMultiplier, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "Scalar value used to simulate clock hacking cheats for validating bank time system and anticheat");
 #endif
 
@@ -477,7 +477,7 @@ namespace Multiplayer
         const double inputRate = static_cast<double>(static_cast<AZ::TimeMs>(cl_InputRateMs)) / 1000.0;
         const double maxRewindHistory = static_cast<double>(static_cast<AZ::TimeMs>(cl_MaxRewindHistoryMs)) / 1000.0;
 
-#ifndef _RELEASE
+#ifndef AZ_RELEASE_BUILD
         m_moveAccumulator += deltaTime * cl_DebugHackTimeMultiplier;
 #else
         m_moveAccumulator += deltaTime;

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp

@@ -71,11 +71,9 @@ namespace Multiplayer
             while (m_byteStream.GetCurPos() < m_byteStream.GetLength())
             {
                 AZ::Data::AssetId assetId;
-                AZ::Data::AssetLoadBehavior assetLoadBehavior;
                 uint32_t hintSize;
                 AZStd::string assetHint;
                 m_byteStream.Read(sizeof(AZ::Data::AssetId), reinterpret_cast<void*>(&assetId));
-                m_byteStream.Read(sizeof(AZ::Data::AssetLoadBehavior), reinterpret_cast<void*>(&assetLoadBehavior));
                 m_byteStream.Read(sizeof(uint32_t), reinterpret_cast<void*>(&hintSize));
                 assetHint.resize(hintSize);
                 m_byteStream.Read(hintSize, assetHint.data());
@@ -83,7 +81,7 @@ namespace Multiplayer
                 size_t assetSize = m_byteStream.GetCurPos();
                 AZ::Data::AssetData* assetDatum = AZ::Utils::LoadObjectFromStream<AZ::Data::AssetData>(m_byteStream, nullptr);
                 assetSize = m_byteStream.GetCurPos() - assetSize;
-                AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::Asset<AZ::Data::AssetData>(assetId, assetDatum, assetLoadBehavior);
+                AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::Asset<AZ::Data::AssetData>(assetId, assetDatum, AZ::Data::AssetLoadBehavior::NoLoad);
                 asset.SetHint(assetHint);
 
                 AZ::Data::AssetInfo assetInfo;
@@ -104,7 +102,7 @@ namespace Multiplayer
             m_byteStream.Truncate();
 
             // Load the level via the root spawnable that was registered
-            AZ::CVarFixedString loadLevelString = "LoadLevel Root.spawnable";
+            const AZ::CVarFixedString loadLevelString = "LoadLevel Root.spawnable";
             AZ::Interface<AZ::IConsole>::Get()->PerformCommand(loadLevelString.c_str());
 
             // Setup the normal multiplayer connection

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp

@@ -169,15 +169,13 @@ namespace Multiplayer
             AZ::IO::ByteContainerStream byteStream(&buffer);
 
             // Serialize Asset information and AssetData into a potentially large buffer
-            for (auto asset : assetData)
+            for (auto& asset : assetData)
             {
                 AZ::Data::AssetId assetId = asset.GetId();
-                AZ::Data::AssetLoadBehavior assetLoadBehavior = asset.GetAutoLoadBehavior();
                 AZStd::string assetHint = asset.GetHint();
                 uint32_t hintSize = aznumeric_cast<uint32_t>(assetHint.size());
 
                 byteStream.Write(sizeof(AZ::Data::AssetId), reinterpret_cast<void*>(&assetId));
-                byteStream.Write(sizeof(AZ::Data::AssetLoadBehavior), reinterpret_cast<void*>(&assetLoadBehavior));
                 byteStream.Write(sizeof(uint32_t), reinterpret_cast<void*>(&hintSize));
                 byteStream.Write(assetHint.size(), assetHint.data());
                 AZ::Utils::SaveObjectToStream(byteStream, AZ::DataStream::ST_BINARY, asset.GetData(), asset.GetData()->GetType());

Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h

@@ -129,7 +129,7 @@ namespace Multiplayer
         AZ::TimeMs m_lastReplicatedHostTimeMs = AZ::TimeMs{ 0 };
         HostFrameId m_lastReplicatedHostFrameId = InvalidHostFrameId;
 
-#if !defined(_RELEASE)
+#if !defined(AZ_RELEASE_BUILD)
         MultiplayerEditorConnection m_editorConnectionListener;
 #endif
     };