diff --git a/doomsday/sdk/libcore/src/scriptsys/bindings_core.cpp b/doomsday/sdk/libcore/src/scriptsys/bindings_core.cpp index 15c3b40824..184c35b47d 100644 --- a/doomsday/sdk/libcore/src/scriptsys/bindings_core.cpp +++ b/doomsday/sdk/libcore/src/scriptsys/bindings_core.cpp @@ -62,6 +62,11 @@ static Value *Function_String_Lower(Context &ctx, Function::ArgumentValues const return new TextValue(ctx.instanceScope().asText().lower()); } +static Value *Function_Path_WithoutFileName(Context &, Function::ArgumentValues const &args) +{ + return new TextValue(args.at(0)->asText().fileNamePath()); +} + static Value *Function_Dictionary_Keys(Context &ctx, Function::ArgumentValues const &) { return ctx.instanceScope().as().contentsAsArray(DictionaryValue::Keys); @@ -170,6 +175,13 @@ void initCoreModule(Binder &binder, Record &coreModule) << DENG2_FUNC_NOARG(String_FileNameAndPathWithoutExtension, "fileNameAndPathWithoutExtension"); } + // Path + { + Record &path = coreModule.addRecord("Path"); + binder.init(path) + << DENG2_FUNC(Path_WithoutFileName, "withoutFileName", "path"); + } + // File { Record &file = coreModule.addRecord("File"); diff --git a/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp b/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp index c182572932..51ae04ade8 100644 --- a/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp +++ b/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp @@ -36,11 +36,6 @@ namespace de { -static Value *Function_Path_WithoutFileName(Context &, Function::ArgumentValues const &args) -{ - return new TextValue(args.at(0)->asText().fileNamePath()); -} - static ScriptSystem *_scriptSystem = 0; DENG2_PIMPL(ScriptSystem) @@ -54,7 +49,6 @@ DENG2_PIMPL(ScriptSystem) NativeModules nativeModules; // not owned Record coreModule; // Script: built-in script classes and functions. Record versionModule; // Version: information about the platform and build - Record pathModule; // Path: path manipulation routines (based on native classes Path, NativePath, String) /// Resident modules. typedef QMap Modules; // owned @@ -87,11 +81,6 @@ DENG2_PIMPL(ScriptSystem) #endif addNativeModule("Version", mod); } - - // Setup the Path module. - binder.init(pathModule) - << DENG2_FUNC(Path_WithoutFileName, "withoutFileName", "path"); - addNativeModule("Path", pathModule); } ~Instance()