Skip to content
Permalink
Browse files

- typo fixes

  • Loading branch information...
cozy1 committed Sep 20, 2019
1 parent 7486b46 commit 013e9e815e4534b5e74cb47f0c60f388eb006ce6
@@ -210,11 +210,13 @@ public List<string> UnpackSongs(IEnumerable<string> srcPaths, string destPath)
{
try
{
// check for ODLC/SongPack
//var isODLC = !Directory.EnumerateFiles(unpackedDir, "toolkit.version", SearchOption.AllDirectories).Any();
var isSongPack = Directory.EnumerateFiles(unpackedDir, "*.wem", SearchOption.AllDirectories).Count() > 2;
if (isSongPack) // && isODLC)
throw new Exception("Found too many *.wem files.");
if (isSongPack)
throw new Exception("SongPacks have too many *.wem files to process and load.");

//var isODLC = !Directory.EnumerateFiles(unpackedDir, "toolkit.version", SearchOption.AllDirectories).Any();
//if (isODLC)
// throw new Exception("Uncheck 'Autosave Templates' in 'General Config' to avoid this error.");

if (srcPlatform.platform == GamePlatform.None)
throw new Exception("Could not determine GamePlatform.");
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("16369af2")]
[assembly: AssemblyInformationalVersion("7486b460")]
[assembly: AssemblyConfiguration("")]
@@ -47,16 +47,16 @@ public static void Wav2Wem(string wavSourcePath, string destinationPath, int aud

public static string GetWwisePath()
{
// Audiokinetic Wwise might not be installed in the default location ;<
// always use the Configuration Wwise Path if entered
// support for Wwise v2013.2.x v2014.1.x 2015.1.x or 2016.2.x series
// Wwise may not be installed in the default location so use the Configuration Wwise Path if entered
var wwiseRoot = ConfigRepository.Instance()["general_wwisepath"];
// otherwise use the WWISEROOT Environmental Variable
if (String.IsNullOrEmpty(ConfigRepository.Instance()["general_wwisepath"]))
wwiseRoot = Environment.GetEnvironmentVariable("WWISEROOT");

if (String.IsNullOrEmpty(wwiseRoot))
throw new FileNotFoundException("Could not find Audiokinetic Wwise installation." + Environment.NewLine +
"Download and install Wwise v2013.2.x from: ignition.customsforge.com/cfsm/wwise" + Environment.NewLine);
throw new ApplicationException("Could not find Audiokinetic Wwise installation." + new string(' ', 2) +
"Download and install Wwise v2013.2.x from: http://ignition.customsforge.com/cfsm/wwise" + Environment.NewLine);

var wwiseCLIPath = Directory.EnumerateFiles(wwiseRoot, "WwiseCLI.exe", SearchOption.AllDirectories);
if (!wwiseCLIPath.Any())
@@ -67,9 +67,8 @@ public static string GetWwisePath()
}

if (!wwiseCLIPath.Any())
throw new FileNotFoundException("Could not find 'WwiseCLI.exe' in " + wwiseRoot + Environment.NewLine +
"Download and install Wwise v2013.2.x from: ignition.customsforge.com/cfsm/wwise" + Environment.NewLine);
// "Please confirm that either Wwise v2013.2.x v2014.1.x 2015.1.x or 2016.2.x series is installed." + Environment.NewLine);
throw new FileNotFoundException("Could not find 'WwiseCLI.exe' in " + wwiseRoot + " subfolders." + new string(' ', 2) +
"Download and install Wwise v2013.2.x from: http://ignition.customsforge.com/cfsm/wwise" + Environment.NewLine);

//win32 = 32bit x64 = 64bit
string wwiseCLIexe = wwiseCLIPath.AsParallel().SingleOrDefault(e => e.Contains("Authoring\\Win32"));
@@ -103,11 +102,9 @@ public static string GetWwisePath()
Selected = OggFile.WwiseVersion.None;

if (Selected == OggFile.WwiseVersion.None)
throw new FileNotFoundException("You have no compatible version of Audiokinetic Wwise installed." + Environment.NewLine +
"Download and install Wwise v2013.2.x from: ignition.customsforge.com/cfsm/wwise" + Environment.NewLine +
//"Install supported Wwise version, which are v2013.2.x || v2014.1.x || v2015.1.x || v2016.2.x series " + Environment.NewLine +
"if you would like to use toolkit's Wwise autoconvert feature. Did you remember to set the Wwise" + Environment.NewLine +
"installation path in the toolkit General Config menu if you have a custom Wwise installation?" + Environment.NewLine);
throw new ApplicationException("Could not find an installed compatible version of Audiokinetic Wwise." + new string(' ', 2) +
"Download and install Wwise v2013.2.x from: http://ignition.customsforge.com/cfsm/wwise" + new string(' ', 5) +
"Be sure to set the 'Wwise Path' in the General Config menu if you have a custom installation." + Environment.NewLine);

return wwiseCLIexe;
}
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("16369af2")]
[assembly: AssemblyInformationalVersion("7486b460")]
[assembly: AssemblyConfiguration("")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("16369af2")]
[assembly: AssemblyInformationalVersion("7486b460")]
[assembly: AssemblyConfiguration("")]
@@ -1,3 +1,3 @@
2.9.2.0
16369af2
7486b460

0 comments on commit 013e9e8

Please sign in to comment.
You can’t perform that action at this time.