From 2e92534e4d71c6d160dd13264b3ee7451c2aed74 Mon Sep 17 00:00:00 2001 From: RektInator Date: Sat, 22 Apr 2017 18:27:52 +0200 Subject: [PATCH] [Isnd_alias_list_t] Property setting from json implemented, speakermap is todo. --- .../AssetInterfaces/Isnd_alias_list_t.cpp | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/Components/Modules/AssetInterfaces/Isnd_alias_list_t.cpp b/src/Components/Modules/AssetInterfaces/Isnd_alias_list_t.cpp index d2c9c1a1..4b4b4a84 100644 --- a/src/Components/Modules/AssetInterfaces/Isnd_alias_list_t.cpp +++ b/src/Components/Modules/AssetInterfaces/Isnd_alias_list_t.cpp @@ -85,8 +85,44 @@ namespace Assets CHECK(volumeFalloffCurve, string) && CHECK(envelopMin, number) && CHECK(envelopMax, number) && CHECK(envelopPercentage, number) && CHECK(speakerMap, string)) { + alias->soundFile->exists = true; + if (subtitle.is_string()) + { + alias->subtitle = subtitle.string_value().data(); + } + if (secondaryAliasName.is_string()) + { + alias->secondaryAliasName = secondaryAliasName.string_value().data(); + } + if (chainAliasName.is_string()) + { + alias->chainAliasName = chainAliasName.string_value().data(); + } + + alias->sequence = sequence.int_value(); + alias->volMin = volMin.int_value(); + alias->volMax = volMax.int_value(); + alias->pitchMin = pitchMin.int_value(); + alias->pitchMax = pitchMax.int_value(); + alias->distMin = distMin.int_value(); + alias->distMax = distMax.int_value(); + alias->flags = flags.int_value(); + alias->slavePercentage = slavePercentage.int_value(); + alias->probability = probability.int_value(); + alias->lfePercentage = lfePercentage.int_value(); + alias->centerPercentage = centerPercentage.int_value(); + alias->startDelay = startDelay.int_value(); + alias->envelopMin = envelopMin.int_value(); + alias->envelopMax = envelopMax.int_value(); + alias->envelopPercentage = envelopPercentage.int_value(); + + if (volumeFalloffCurve.is_string()) + { + alias->volumeFalloffCurve = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_SOUND_CURVE, volumeFalloffCurve.string_value(), builder).sndCurve; + } + if (type.string_value() == "loaded"s) { alias->soundFile->type = Game::SAT_LOADED;