From ae2e99a5609497b1a7679320c565208a196b1ff4 Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Sat, 10 Mar 2018 07:00:09 +0100 Subject: [PATCH] Updating loader so that it allows to load complete mission scripts for mission designers from other paths. --- Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua | 4 +--- Moose Setup/Moose_Create.lua | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua b/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua index 87044ad51..70371bf3a 100644 --- a/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua +++ b/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua @@ -7,7 +7,7 @@ __Moose = {} __Moose.Include = function( IncludeFile ) if not __Moose.Includes[ IncludeFile ] then __Moose.Includes[IncludeFile] = IncludeFile - local f = assert( base.loadfile( __Moose.ProgramPath .. IncludeFile ) ) + local f = assert( base.loadfile( IncludeFile ) ) if f == nil then error ("Moose: Could not load Moose file " .. IncludeFile ) else @@ -17,6 +17,4 @@ __Moose.Include = function( IncludeFile ) end end -__Moose.ProgramPath = "Scripts/Moose/" - __Moose.Includes = {} diff --git a/Moose Setup/Moose_Create.lua b/Moose Setup/Moose_Create.lua index c15f3f5e2..500a56965 100644 --- a/Moose Setup/Moose_Create.lua +++ b/Moose Setup/Moose_Create.lua @@ -47,7 +47,7 @@ while( MooseSource ) do local MooseFilePath = MooseDevelopmentPath .. "/" .. MooseSource if MooseDynamicStatic == "D" then print( "Load dynamic: " .. MooseSource ) - MooseFile:write( "__Moose.Include( '" .. MooseSource .. "' )\n" ) + MooseFile:write( "__Moose.Include( 'Scripts/Moose/" .. MooseSource .. "' )\n" ) end if MooseDynamicStatic == "S" then print( "Load static: " .. MooseSource )