Legacy cleanup, part 2 (#3659)
* Legacy cleanup, part 2 There are still things that can be removed, those will be likely done in part three: `The Return of the Cleanup` :) Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix windows build Somehow there were some unfixed errors from enabled warnings? I'm unsure if I've pulled repo in unstable state, or those were somehow missed. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
@@ -10,9 +10,11 @@
|
||||
#pragma once
|
||||
|
||||
#include <ILocalizationManager.h>
|
||||
#include <ISystem.h>
|
||||
#include <StlUtils.h>
|
||||
#include <VectorMap.h>
|
||||
#include <AzCore/std/containers/map.h>
|
||||
#include <CryCommon/LegacyAllocator.h>
|
||||
|
||||
#include "Huffman.h"
|
||||
|
||||
@@ -153,9 +155,9 @@ private:
|
||||
CryHalf fVolume;
|
||||
CryHalf fRadioRatio;
|
||||
// SoundMoods
|
||||
DynArray<SLocalizedAdvancesSoundEntry> SoundMoods;
|
||||
AZStd::vector<SLocalizedAdvancesSoundEntry, AZ::StdLegacyAllocator> SoundMoods;
|
||||
// EventParameters
|
||||
DynArray<SLocalizedAdvancesSoundEntry> EventParameters;
|
||||
AZStd::vector<SLocalizedAdvancesSoundEntry, AZ::StdLegacyAllocator> EventParameters;
|
||||
// ~audio specific part
|
||||
|
||||
// subtitle & radio flags
|
||||
@@ -312,5 +314,3 @@ private:
|
||||
mutable AZStd::mutex m_cs;
|
||||
typedef AZStd::lock_guard<AZStd::mutex> AutoLock;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user