diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index 6dd243048..ee642d711 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -9,6 +9,7 @@ concurrency: cancel-in-progress: true jobs: build-windows: + if: github.repository == 'TorqueGameEngines/Torque3D' name: ${{matrix.config.name}} runs-on: windows-latest strategy: diff --git a/.github/workflows/test-results-linux.yml b/.github/workflows/test-results-linux.yml index 7f61a8c5f..23a6b7a23 100644 --- a/.github/workflows/test-results-linux.yml +++ b/.github/workflows/test-results-linux.yml @@ -21,6 +21,7 @@ jobs: runos: ubuntu-latest, artifact-name: "torque3dLinuxGCCUnitTest" } + steps: - name: Download Linux Test Report uses: dawidd6/action-download-artifact@v2 diff --git a/Engine/source/console/arrayObject.cpp b/Engine/source/console/arrayObject.cpp index d5eaffe98..cfd25d6cb 100644 --- a/Engine/source/console/arrayObject.cpp +++ b/Engine/source/console/arrayObject.cpp @@ -404,22 +404,6 @@ void ArrayObject::uniqueKey() //----------------------------------------------------------------------------- -void ArrayObject::uniquePair() -{ - for (S32 i = 0; i < mArray.size(); i++) - { - for (S32 j = i + 1; j < mArray.size(); j++) - { - if (isEqual(mArray[i].key, mArray[j].key) && isEqual(mArray[i].value, mArray[j].value)) - { - erase(j); - j--; - } - } - } -} -//----------------------------------------------------------------------------- - void ArrayObject::duplicate(ArrayObject* obj) { empty(); @@ -756,12 +740,6 @@ DefineEngineMethod( ArrayObject, uniqueKey, void, (),, object->uniqueKey(); } -DefineEngineMethod(ArrayObject, uniquePair, void, (), , - "Removes any elements that have duplicated key and value pairs (leaving the first instance)") -{ - object->uniquePair(); -} - DefineEngineMethod( ArrayObject, duplicate, bool, ( ArrayObject* target ),, "Alters array into an exact duplicate of the target array.\n" "@param target ArrayObject to duplicate\n" ) diff --git a/Engine/source/console/arrayObject.h b/Engine/source/console/arrayObject.h index cde4f92b6..81531b6c2 100644 --- a/Engine/source/console/arrayObject.h +++ b/Engine/source/console/arrayObject.h @@ -158,10 +158,6 @@ public: /// (keeps the first instance only) void uniqueKey(); - /// Removes any duplicate keys from the array - /// (keeps the first instance only) - void uniquePair(); - /// Makes this array an exact duplicate of another array void duplicate( ArrayObject *obj ); @@ -233,4 +229,4 @@ public: static void initPersistFields(); }; -#endif // _ARRAYOBJECT_H_ +#endif // _ARRAYOBJECT_H_ \ No newline at end of file diff --git a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript index fc6e0d33c..905100648 100644 --- a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript @@ -650,7 +650,7 @@ function populateAllFonts() continue; %fontarray.push_back(%obj.fontType,%obj.fontSize); } - %fontarray.uniquePair(); + %fontarray.uniqueKey(); %fontarrayCount = %fontarray.count();