From ade2e99586f2b3bee65c7ead4da194e60838c4c4 Mon Sep 17 00:00:00 2001 From: Kernell Date: Thu, 3 Dec 2015 01:54:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BB=D1=8F=20.NE?= =?UTF-8?q?T=204.5,=20=D0=B8=D0=BD=D0=B0=D1=87=D0=B5=20=D0=BD=D0=B5=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20=D0=BD=D0=B5=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82=20(=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=D0=B8=D0=B5=20=D0=BA=D0=B0=D0=BA=20MySQL=20Connector/Net?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mta-mono/src/CMonoDomain.cpp | 5 +++++ mta-mono/src/CMonoDomain.h | 1 + mta-mono/src/CResource.cpp | 2 ++ mta-mono/src/mta-mono.cpp | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mta-mono/src/CMonoDomain.cpp b/mta-mono/src/CMonoDomain.cpp index ec54e43..b7ddb64 100644 --- a/mta-mono/src/CMonoDomain.cpp +++ b/mta-mono/src/CMonoDomain.cpp @@ -175,6 +175,11 @@ MonoObject* CMonoDomain::CreateObject( MonoClass* klass ) return mono_object_new( this->m_pDomain, klass ); } +void CMonoDomain::SetConfig( const char *szBaseDir, const char *szConfigFileName ) +{ + mono_domain_set_config( this->m_pDomain, szBaseDir, szConfigFileName ); +} + MonoString* CMonoDomain::NewString( const char* szText ) { return mono_string_new( this->m_pDomain, szText ); diff --git a/mta-mono/src/CMonoDomain.h b/mta-mono/src/CMonoDomain.h index 683becd..0dc3881 100644 --- a/mta-mono/src/CMonoDomain.h +++ b/mta-mono/src/CMonoDomain.h @@ -55,6 +55,7 @@ public: bool Set ( bool bForce ); MonoAssembly* OpenAssembly ( const char *szName ); MonoObject* CreateObject ( MonoClass* klass ); + void SetConfig ( const char *szBaseDir, const char *szConfigFileName ); MonoString* NewString ( const char* szText ); MonoString* NewString ( string strText ); diff --git a/mta-mono/src/CResource.cpp b/mta-mono/src/CResource.cpp index bac6465..63bfc9a 100644 --- a/mta-mono/src/CResource.cpp +++ b/mta-mono/src/CResource.cpp @@ -156,6 +156,8 @@ bool CResource::Init( void ) return false; } + this->m_pMonoDomain->SetConfig( "mods/deathmatch/", "mods/deathmatch/mono/etc/mono/4.5/machine.config" ); + this->m_pMonoDomain->Set( false ); this->m_pMonoDomain->Init(); diff --git a/mta-mono/src/mta-mono.cpp b/mta-mono/src/mta-mono.cpp index 021cea9..2b7fc30 100644 --- a/mta-mono/src/mta-mono.cpp +++ b/mta-mono/src/mta-mono.cpp @@ -12,7 +12,7 @@ #define MODULE_NAME "Mono 4.2.1" #define MODULE_AUTHOR "Dmitry Korolev " -#define MODULE_VERSION 0.1f +#define MODULE_VERSION 0.2f #include "CFunctions.h" #include "CResource.h"