mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 16:14:38 +00:00
include metal FootMetalSound oversight, include correction for mangled entries where a given varname and a given assetname match
This commit is contained in:
parent
5c7069555a
commit
c99c9cc365
2 changed files with 6 additions and 6 deletions
|
|
@ -945,7 +945,7 @@ $rigidEntriesList = $rigidEntriesList SPC "waterWakeSound waterWakeSoundAsset";
|
||||||
T3Dpre4ProjectImporter::genProcessor("RigidShapeData",$rigidEntriesList);
|
T3Dpre4ProjectImporter::genProcessor("RigidShapeData",$rigidEntriesList);
|
||||||
|
|
||||||
$PlayerEntriesList = "shapeFP shapeFPAsset shapeNameFP shapeFPAsset";
|
$PlayerEntriesList = "shapeFP shapeFPAsset shapeNameFP shapeFPAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset FootMetalSound FootMetal";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootSnowSound FootSnowAsset FootShallowSound FootShallowSplashAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootSnowSound FootSnowAsset FootShallowSound FootShallowSplashAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootWadingSound FootWadingAsset FootUnderwaterSound FootUnderWaterAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootWadingSound FootWadingAsset FootUnderwaterSound FootUnderWaterAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootBubblesSound FootBubblesAsset movingBubblesSound MoveBubblesAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootBubblesSound FootBubblesAsset movingBubblesSound MoveBubblesAsset";
|
||||||
|
|
|
||||||
|
|
@ -515,7 +515,7 @@ function testFilenameExtensions(%filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
function processLegacyField(%line, %originalFieldName, %newFieldName)
|
function processLegacyField(%line, %originalFieldName, %newFieldName)
|
||||||
{
|
{
|
||||||
if(!strIsMatchExpr("*"@%originalFieldName@"=*;*", %line) &&
|
if(!strIsMatchExpr("*"@%originalFieldName@"=*;*", %line) &&
|
||||||
!strIsMatchExpr("*"@%originalFieldName@"[*=*;*", %line) &&
|
!strIsMatchExpr("*"@%originalFieldName@"[*=*;*", %line) &&
|
||||||
!strIsMatchExpr("*"@%originalFieldName@" *=*;*", %line))
|
!strIsMatchExpr("*"@%originalFieldName@" *=*;*", %line))
|
||||||
|
|
@ -603,10 +603,10 @@ function processLegacyField(%line, %originalFieldName, %newFieldName)
|
||||||
if(!strIsMatchExpr("*\"*\"*", %originalValue))
|
if(!strIsMatchExpr("*\"*\"*", %originalValue))
|
||||||
%assetId = "\"" @ %assetId @ "\"";
|
%assetId = "\"" @ %assetId @ "\"";
|
||||||
|
|
||||||
//if (%assetId.getStatusString() $= "Ok")
|
%firstPart = getToken(%outLine, "=", 0);
|
||||||
%outLine = strReplace(%outLine, %value, %assetId);
|
%secondPart = getToken(%outLine, "=", 1);
|
||||||
//else
|
%secondPart = strReplace(%secondPart, %value, %assetId);
|
||||||
// error("Asset assignment failure:", %assetId, getStatusString());
|
%outLine = %firstPart @ "=" @ %secondPart;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue