Skip to content

Commit 5e0ee4e

Browse files
Fixed issue which could cause redundant checks to be performed on sprites, potentially resulting in a crash.
Removed error throw for null sound data, as this would trigger for external sounds. Removed error throw for missing audio and group id Fixed margin parameter being exported with invalid parameter name Fixed playback_speed_type being imported with an incorrect parameter name
1 parent dc71d72 commit 5e0ee4e

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Scripts/HgExport.csx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -860,19 +860,19 @@ void AddSpriteParams(string assetName, UndertaleData VanillaData, UndertaleData
860860
paramValues.Add(modSprite.Height.ToString());
861861
}
862862
if (vanillaSprite.MarginLeft != modSprite.MarginLeft) {
863-
paramNames.Add("margin_");
863+
paramNames.Add("margin_left");
864864
paramValues.Add(modSprite.MarginLeft.ToString());
865865
}
866866
if (vanillaSprite.MarginRight != modSprite.MarginRight) {
867-
paramNames.Add("margin_");
867+
paramNames.Add("margin_right");
868868
paramValues.Add(modSprite.MarginRight.ToString());
869869
}
870870
if (vanillaSprite.MarginBottom != modSprite.MarginBottom) {
871-
paramNames.Add("margin_");
871+
paramNames.Add("margin_bottom");
872872
paramValues.Add(modSprite.MarginBottom.ToString());
873873
}
874874
if (vanillaSprite.MarginTop != modSprite.MarginTop) {
875-
paramNames.Add("margin_");
875+
paramNames.Add("margin_top");
876876
paramValues.Add(modSprite.MarginTop.ToString());
877877
}
878878
if (vanillaSprite.Transparent != modSprite.Transparent) {
@@ -1077,7 +1077,8 @@ void AddSoundData (string assetName, UndertaleData VanillaData, UndertaleData Mo
10771077
byte[] modSoundData = GetSoundData(modSound, ModData, ModDataPath, false);
10781078
if (modSoundData == null) {
10791079
// TODO: Handle this better
1080-
throw new Exception(String.Format("ERROR: {0}'s sound data was null, cannot export.", assetName));
1080+
//throw new Exception(String.Format("ERROR: {0}'s sound data was null, cannot export.", assetName));
1081+
return;
10811082
}
10821083

10831084
string outPath = String.Format("{0}.snd", Path.Join(soundPath, assetName));
@@ -1546,11 +1547,13 @@ void CompareSpriteForAddition(UndertaleSprite modSprite, TempDataContainer tempV
15461547
lock(AssetsAlteredDataDict) {
15471548
AssetsAlteredDataDict.Add(modSprite.Name.Content, AssetType.Sprite);
15481549
}
1550+
return;
15491551
}
15501552
if (!AllMaskEquals(vanillaSprite, modSprite)) {
15511553
lock(AssetsAlteredDataDict) {
15521554
AssetsAlteredDataDict.Add(modSprite.Name.Content, AssetType.Mask);
15531555
}
1556+
return;
15541557
}
15551558
}
15561559
}

0 commit comments

Comments
 (0)