diff --git a/Source/Engine/Core/Types/Variant.cpp b/Source/Engine/Core/Types/Variant.cpp index 6692aef6e..8d2d3a925 100644 --- a/Source/Engine/Core/Types/Variant.cpp +++ b/Source/Engine/Core/Types/Variant.cpp @@ -1228,7 +1228,7 @@ bool Variant::operator==(const Variant& other) const #elif USE_MONO return AsUint == other.AsUint || MCore::GCHandle::GetTarget(AsUint) == MCore::GCHandle::GetTarget(other.AsUint); #else - return nullptr; + return false; #endif default: return false; @@ -1324,7 +1324,7 @@ Variant::operator bool() const #elif USE_MONO return AsUint != 0 && MCore::GCHandle::GetTarget(AsUint) != nullptr; #else - return nullptr; + return false; #endif default: return false; diff --git a/Source/Engine/Scripting/Runtime/None.cpp b/Source/Engine/Scripting/Runtime/None.cpp index db902a634..c9e51f8ea 100644 --- a/Source/Engine/Scripting/Runtime/None.cpp +++ b/Source/Engine/Scripting/Runtime/None.cpp @@ -234,7 +234,7 @@ bool MAssembly::LoadCorlib() return false; } -bool MAssembly::LoadImage(const String& assemblyPath) +bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePath) { _hasCachedClasses = false; _assemblyPath = assemblyPath; @@ -246,6 +246,11 @@ bool MAssembly::UnloadImage(bool isReloading) return false; } +bool MAssembly::ResolveMissingFile(String& assemblyPath) const +{ + return true; +} + MClass::~MClass() { _fields.ClearDelete();