From c051a0357c3f9d535b3d1f3698c6f24ada6fe266 Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 13 Jan 2021 01:51:05 -0600 Subject: [PATCH] Fixes some conversion mistakes in the scripts --- .../game/tools/VerveEditor/Scripts/Events/main.tscript | 4 ++-- .../assetBrowser/scripts/assetTypes/gameObject.tscript | 4 ++-- .../tools/assetBrowser/scripts/assetTypes/script.tscript | 4 ++-- .../tools/assetBrowser/scripts/looseFileAudit.tscript | 4 ++-- .../game/tools/assetBrowser/scripts/popupMenus.tscript | 2 +- .../game/tools/editorClasses/scripts/expandos.ed.tscript | 8 ++++---- .../scripts/projects/projectInternalInterface.ed.tscript | 4 ++-- .../BaseGame/game/tools/gui/guiObjectInspector.ed.tscript | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript index 178cae07a..b97027df2 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript @@ -3,7 +3,7 @@ // Copyright (C) - Violent Tulip //----------------------------------------------------------------------------- -function VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s() +function VerveEditor::InitEventScripts() { // Core. exec( "./VEvent." @ $TorqueScriptFileExtension ); @@ -27,4 +27,4 @@ function VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s() // Custom. // Exec Custom Event Scripts. } -VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s(); +VerveEditor::InitEventScripts(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript index 6b1e37977..617c6f8ba 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript @@ -14,10 +14,10 @@ function AssetBrowser::createGameObjectAsset(%this) function AssetBrowser::editGameObjectAsset(%this, %assetDef) { //We have no dedicated GO editor for now, so just defer to the script editing aspect - %this.editGameObjectAsse" @ $TorqueScriptFileExtension @ "(%assetDef); + %this.editGameObjectAssetScript(%assetDef); } -function AssetBrowser::editGameObjectAsse" @ $TorqueScriptFileExtension @ "(%this, %assetDef) +function AssetBrowser::editGameObjectAssetScript(%this, %assetDef) { %scriptFile = %assetDef.scriptFile; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript index 708c3add2..adc921013 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript @@ -32,7 +32,7 @@ function AssetBrowser::createScriptAsset(%this) return %tamlpath; } -function AssetBrowser::edi" @ $TorqueScriptFileExtension @ "Asset(%this, %assetDef) +function AssetBrowser::editScriptAsset(%this, %assetDef) { %scriptFile = %assetDef.scriptFile; @@ -43,7 +43,7 @@ function AssetBrowser::duplicateScriptAsset(%this, %assetDef, %targetModule) { } -function AssetBrowser::impor" @ $TorqueScriptFileExtension @ "Asset(%this, %assetId) +function AssetBrowser::importScriptAsset(%this, %assetId) { } diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript index 350a8b117..28fafde0e 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript @@ -23,7 +23,7 @@ function LooseFileAuditWindow::buildPopupMenus(%this) superClass = "MenuBuilder"; class = "EditorWorldMenu"; - item[0] = "Make a Script Asset" TAB "" TAB "LooseFileAuditWindow.impor" @ $TorqueScriptFileExtension @ "();"; + item[0] = "Make a Script Asset" TAB "" TAB "LooseFileAuditWindow.importScript();"; item[1] = "Make a PostFX Asset" TAB "" TAB "LooseFileAuditWindow.importPostFX();"; item[2] = "Make a Material Asset" TAB "" TAB "LooseFileAuditWindow.importMaterial();"; item[3] = "Make a Terrain Material Asset" TAB "" TAB "LooseFileAuditWindow.importTerrMat();"; @@ -199,7 +199,7 @@ function LooseFileAuditWindow::importImage(%this) LooseFileList.expandItem(0); } -function LooseFileAuditWindow::impor" @ $TorqueScriptFileExtension @ "(%this) +function LooseFileAuditWindow::importScript(%this) { if(!ImportAssetWindow.isAwake()) ImportAssetWindow.showDialog(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript index 8dec147cd..31909cf07 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript @@ -329,7 +329,7 @@ function AssetBrowser::buildPopupMenus(%this) //isPopup = true; item[ 0 ] = "Open GameObject Editor" TAB "" TAB "echo(\"Not yet implemented.\");"; - item[ 1 ] = "Edit GameObject Script" TAB "" TAB "AssetBrowser.editGameObjectAsse" @ $TorqueScriptFileExtension @ "(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));"; + item[ 1 ] = "Edit GameObject Script" TAB "" TAB "AssetBrowser.editGameObjectAssetScript(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));"; item[ 2 ] = "-"; item[ 3 ] = "Apply Instance to GameObject" TAB "" TAB "AssetBrowser.applyInstanceToGameObject(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));"; item[ 4 ] = "Reset Instance to GameObject" TAB "" TAB "echo(\"Not yet implemented.\");"; diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript b/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript index 771dcc861..6d2804fe3 100644 --- a/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript +++ b/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript @@ -26,11 +26,11 @@ function setupBaseExpandos() // FIXME TGEA doesnt currently have these due to the way it's built return; - se" @ $TorqueScriptFileExtension @ "PathExpando("tools", getExecutablePath() @ "/tools", true); - se" @ $TorqueScriptFileExtension @ "PathExpando("tool", getExecutablePath() , true); - se" @ $TorqueScriptFileExtension @ "PathExpando("toolResources", getExecutablePath() @ "/resources", true); + setScriptPathExpando("tools", getExecutablePath() @ "/tools", true); + setScriptPathExpando("tool", getExecutablePath() , true); + setScriptPathExpando("toolResources", getExecutablePath() @ "/resources", true); - se" @ $TorqueScriptFileExtension @ "PathExpando("core", getExecutablePath() @ "/core", true); + setScriptPathExpando("core", getExecutablePath() @ "/core", true); // Remove the game expando so we can use this to reset expandos removeScriptPathExpando("game"); diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript b/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript index 446870317..d78f0a67a 100644 --- a/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript +++ b/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript @@ -112,8 +112,8 @@ function ProjectBase::_onProjectOpen( %this, %data ) setCurrentDirectory( %this.gamePath ); // Set ^game expando - se" @ $TorqueScriptFileExtension @ "PathExpando("project", %this.gamePath ); - se" @ $TorqueScriptFileExtension @ "PathExpando("game", %this.gamePath @ "/game" ); + setScriptPathExpando("project", %this.gamePath ); + setScriptPathExpando("game", %this.gamePath @ "/game" ); %this.onProjectOpen( %data ); %this.setActive(); diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript index f6ef84fff..33b65f6bd 100644 --- a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript @@ -143,7 +143,7 @@ function GuiObjectInspectorMethodList::init( %this, %object ) %methods = %object.dumpMethods(); %count = %methods.count(); %methodsGroup = %this.insertItem( 0, "Methods" ); - %paren" @ $TorqueScriptFileExtension @ "ed = %this.insertItem( %methodsGroup, "Scripted" ); + %parentScripted = %this.insertItem( %methodsGroup, "Scripted" ); %parentNative = %this.insertItem( %methodsGroup, "Native" ); for( %i = 0; %i < %count; %i ++ ) @@ -158,7 +158,7 @@ function GuiObjectInspectorMethodList::init( %this, %object ) %tooltip = %prototype; if( isFile( %fileName ) ) { - %parent = %paren" @ $TorqueScriptFileExtension @ "ed; + %parent = %parentScripted; %tooltip = %tooltip NL "Declared in: " @ %fileName @ ":" @ %lineNumber; } else