Index: trunk/dev/Maratis/Common/MScript/MScript.cpp
===================================================================
--- trunk/dev/Maratis/Common/MScript/MScript.cpp    (revision 107)
+++ trunk/dev/Maratis/Common/MScript/MScript.cpp    (working copy)
@@ -30,6 +30,10 @@

 #include "MScript.h"

+MScriptContext* newScript()
+{
+    return new MScript();
+}

 char g_currentDirectory[256] = "";

Index: trunk/dev/Maratis/Common/MScript/MScript.h
===================================================================
--- trunk/dev/Maratis/Common/MScript/MScript.h  (revision 107)
+++ trunk/dev/Maratis/Common/MScript/MScript.h  (working copy)
@@ -84,4 +84,6 @@
    void pushFloat(float value);
 };

+extern MScriptContext* newScript();
+
 #endif
\ No newline at end of file
Index: trunk/dev/Maratis/Editor/Maratis/Maratis.cpp
===================================================================
--- trunk/dev/Maratis/Editor/Maratis/Maratis.cpp    (revision 107)
+++ trunk/dev/Maratis/Editor/Maratis/Maratis.cpp    (working copy)
@@ -417,6 +417,7 @@
        engine->setRenderingContext(m_render); // rendering context
        engine->setPhysicsContext(m_physics); // physics context
        engine->setScriptContext(m_script); // script context
+        engine->setScriptFactory(newScript); // script factory
        engine->setInputContext(m_input); // input context
        engine->setSystemContext(m_system); // system context

Index: trunk/dev/Maratis/Player/Maratis/MaratisPlayer.cpp
===================================================================
--- trunk/dev/Maratis/Player/Maratis/MaratisPlayer.cpp  (revision 107)
+++ trunk/dev/Maratis/Player/Maratis/MaratisPlayer.cpp  (working copy)
@@ -116,6 +116,7 @@
        engine->setRenderingContext(m_render); // rendering context
        engine->setPhysicsContext(m_physics); // physics context
        engine->setScriptContext(m_script); // script context
+        engine->setScriptFactory(newScript); // script factory
        engine->setInputContext(m_input); // input context
        engine->setSystemContext(m_system); // system context

Index: trunk/dev/MSDK/MCore/Includes/MScriptContext.h
===================================================================
--- trunk/dev/MSDK/MCore/Includes/MScriptContext.h  (revision 107)
+++ trunk/dev/MSDK/MCore/Includes/MScriptContext.h  (working copy)
@@ -65,4 +65,6 @@
    virtual void pushFloat(float value) = 0;
 };

+typedef MScriptContext*(*MScriptFactoryFunc)(void);
+
 #endif
Index: trunk/dev/MSDK/MEngine/Includes/MEngine.h
===================================================================
--- trunk/dev/MSDK/MEngine/Includes/MEngine.h   (revision 107)
+++ trunk/dev/MSDK/MEngine/Includes/MEngine.h   (working copy)
@@ -164,6 +164,7 @@
    MRenderingContext * m_renderingContext;
    MPhysicsContext * m_physicsContext;
    MScriptContext * m_scriptContext;
+    MScriptFactoryFunc m_scriptFactory;
    MInputContext * m_inputContext;
    MSystemContext * m_systemContext;

@@ -205,6 +206,7 @@
    void setRenderingContext(MRenderingContext * renderingContext);
    void setPhysicsContext(MPhysicsContext * physicsContext);
    void setScriptContext(MScriptContext * scriptContext);
+    void setScriptFactory(MScriptFactoryFunc scriptFactory);
    void setInputContext(MInputContext * inputContext);
    void setSystemContext(MSystemContext * systemContext);

@@ -213,6 +215,7 @@
    inline MRenderingContext * getRenderingContext(void){ return m_renderingContext; }
    inline MPhysicsContext * getPhysicsContext(void){ return m_physicsContext; }
    inline MScriptContext * getScriptContext(void){ return m_scriptContext; }
+    inline MScriptContext * newScriptContext(void){ return m_scriptFactory ? m_scriptFactory() : NULL; }
    inline MInputContext * getInputContext(void){ return m_inputContext; }
    inline MSystemContext * getSystemContext(void){ return m_systemContext; }

Index: trunk/dev/MSDK/MEngine/Sources/MEngine.cpp
===================================================================
--- trunk/dev/MSDK/MEngine/Sources/MEngine.cpp  (revision 107)
+++ trunk/dev/MSDK/MEngine/Sources/MEngine.cpp  (working copy)
@@ -76,6 +76,11 @@
    m_scriptContext = scriptContext;
 }

+void MEngine::setScriptFactory(MScriptFactoryFunc scriptFactory)
+{
+    m_scriptFactory = scriptFactory;
+}
+
 void MEngine::setInputContext(MInputContext * inputContext)
 {
    m_inputContext = inputContext;