diff --git a/Source/Engine/Networking/NetworkConfig.h b/Source/Engine/Networking/NetworkConfig.h index 6497043ab..dc05464dd 100644 --- a/Source/Engine/Networking/NetworkConfig.h +++ b/Source/Engine/Networking/NetworkConfig.h @@ -8,6 +8,7 @@ class ScriptingObject; /// /// Network driver implementations enum. +/// [Deprecated in v1.3] /// API_ENUM(Namespace="FlaxEngine.Networking") enum class DEPRECATED NetworkDriverType { @@ -32,6 +33,7 @@ DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkConfig); /// /// The network driver that will be used to create the peer. /// To allow two peers to connect, they must use the same host. + /// [Deprecated in v1.3] /// API_FIELD() DEPRECATED NetworkDriverType NetworkDriverType = NetworkDriverType::ENet; diff --git a/Source/Engine/Scripting/ManagedCLR/MClass.cpp b/Source/Engine/Scripting/ManagedCLR/MClass.cpp index 7bd79aa40..5e01b2551 100644 --- a/Source/Engine/Scripting/ManagedCLR/MClass.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MClass.cpp @@ -69,6 +69,7 @@ MClass::MClass(const MAssembly* parentAssembly, MonoClass* monoClass, const MStr MClass::~MClass() { +#if !COMPILE_WITHOUT_CSHARP #if USE_MONO if (_attrInfo) mono_custom_attrs_free((MonoCustomAttrInfo*)_attrInfo); @@ -78,6 +79,7 @@ MClass::~MClass() _methods.ClearDelete(); _attributes.ClearDelete(); _events.ClearDelete(); +#endif } bool MClass::IsGeneric() const @@ -397,7 +399,7 @@ MObject* MClass::GetAttribute(MClass* monoClass) MonoCustomAttrInfo* attrInfo = GET_CUSTOM_ATTR(); return attrInfo ? mono_custom_attrs_get_attr(attrInfo, monoClass->GetNative()) : nullptr; #else - return false; + return nullptr; #endif } diff --git a/Source/Engine/Scripting/ManagedCLR/MEvent.cpp b/Source/Engine/Scripting/ManagedCLR/MEvent.cpp index 9dfe21ecb..fbbac1524 100644 --- a/Source/Engine/Scripting/ManagedCLR/MEvent.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MEvent.cpp @@ -117,7 +117,7 @@ MObject* MEvent::GetAttribute(MClass* monoClass) const mono_custom_attrs_free(attrInfo); return foundAttr; #else - return false; + return nullptr; #endif } diff --git a/Source/Engine/Scripting/ManagedCLR/MMethod.cpp b/Source/Engine/Scripting/ManagedCLR/MMethod.cpp index 2b2246e94..82e7fd1f3 100644 --- a/Source/Engine/Scripting/ManagedCLR/MMethod.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MMethod.cpp @@ -192,7 +192,7 @@ MObject* MMethod::GetAttribute(MClass* monoClass) const mono_custom_attrs_free(attrInfo); return foundAttr; #else - return false; + return nullptr; #endif } diff --git a/Source/Engine/Scripting/Types.h b/Source/Engine/Scripting/Types.h index d9ea2bf77..5ddba0594 100644 --- a/Source/Engine/Scripting/Types.h +++ b/Source/Engine/Scripting/Types.h @@ -2,6 +2,8 @@ #pragma once +#include "Engine/Platform/Defines.h" + // Forward declarations class Scripting; struct ScriptingType;