diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp index 03aa0bed8b..5ba250c960 100644 --- a/Code/Editor/Export/ExportManager.cpp +++ b/Code/Editor/Export/ExportManager.cpp @@ -46,7 +46,7 @@ namespace SEfResTexture* pTex = pRes->GetTextureResource(nSlot); if (pTex) { - cry_strcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data()); + azstrcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data()); } } diff --git a/Code/Editor/TrackView/CommentNodeAnimator.cpp b/Code/Editor/TrackView/CommentNodeAnimator.cpp index 47f4c5d9ae..579bba00ef 100644 --- a/Code/Editor/TrackView/CommentNodeAnimator.cpp +++ b/Code/Editor/TrackView/CommentNodeAnimator.cpp @@ -92,7 +92,7 @@ void CCommentNodeAnimator::AnimateCommentTextTrack(CTrackViewTrack* pTrack, cons if (commentKey.m_duration > 0 && ac.time < keyHandle.GetTime() + commentKey.m_duration) { m_commentContext.m_strComment = commentKey.m_strComment; - cry_strcpy(m_commentContext.m_strFont, commentKey.m_strFont.c_str()); + azstrcpy(m_commentContext.m_strFont, commentKey.m_strFont.c_str()); m_commentContext.m_color = commentKey.m_color; m_commentContext.m_align = commentKey.m_align; m_commentContext.m_size = commentKey.m_size; diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp index 34ca2f062f..f66bb19bf3 100644 --- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp +++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp @@ -2808,10 +2808,10 @@ void CTrackViewDopeSheetBase::DrawKeys(CTrackViewTrack* pTrack, QPainter* painte } else { - cry_strcpy(keydesc, "{"); + azstrcpy(keydesc, "{"); } - cry_strcat(keydesc, pDescription); - cry_strcat(keydesc, "}"); + azstrcat(keydesc, pDescription); + azstrcat(keydesc, "}"); // Draw key description text. // Find next key. const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom())); diff --git a/Code/Editor/TrackView/TrackViewNodes.cpp b/Code/Editor/TrackView/TrackViewNodes.cpp index d69c256049..90e5598876 100644 --- a/Code/Editor/TrackView/TrackViewNodes.cpp +++ b/Code/Editor/TrackView/TrackViewNodes.cpp @@ -2516,7 +2516,7 @@ int CTrackViewNodesCtrl::GetMatNameAndSubMtlIndexFromName(QString& matName, cons if (const char* pCh = strstr(nodeName, ".[")) { char matPath[MAX_PATH]; - cry_strcpy(matPath, nodeName, (size_t)(pCh - nodeName)); + azstrcpy(matPath, nodeName, (size_t)(pCh - nodeName)); matName = matPath; pCh += 2; if ((*pCh) != 0) diff --git a/Code/Legacy/CryCommon/ISurfaceType.h b/Code/Legacy/CryCommon/ISurfaceType.h index db5ec4eed4..10bddbbe6c 100644 --- a/Code/Legacy/CryCommon/ISurfaceType.h +++ b/Code/Legacy/CryCommon/ISurfaceType.h @@ -85,7 +85,7 @@ struct ISurfaceType }; struct SBreakable2DParams { - string particle_effect; + AZStd::string particle_effect; float blast_radius; float blast_radius_first; float vert_size_spread; @@ -97,12 +97,12 @@ struct ISurfaceType float shard_density; int use_edge_alpha; float crack_decal_scale; - string crack_decal_mtl; + AZStd::string crack_decal_mtl; float max_fracture; - string full_fracture_fx; - string fracture_fx; + AZStd::string full_fracture_fx; + AZStd::string fracture_fx; int no_procedural_full_fracture; - string broken_mtl; + AZStd::string broken_mtl; float destroy_timeout; float destroy_timeout_spread; @@ -125,8 +125,8 @@ struct ISurfaceType }; struct SBreakageParticles { - string type; - string particle_effect; + AZStd::string type; + AZStd::string particle_effect; int count_per_unit; float count_scale; float scale; diff --git a/Code/Legacy/CryCommon/Mocks/IRendererMock.h b/Code/Legacy/CryCommon/Mocks/IRendererMock.h index ff3550a738..be9c1eec8b 100644 --- a/Code/Legacy/CryCommon/Mocks/IRendererMock.h +++ b/Code/Legacy/CryCommon/Mocks/IRendererMock.h @@ -283,7 +283,7 @@ public: MOCK_METHOD0(EF_GetShaderMissLogPath, const char*()); MOCK_METHOD1(EF_GetShaderNames, - string * (int& nNumShaders)); + AZStd::string * (int& nNumShaders)); MOCK_METHOD1(EF_ReloadFile, bool(const char* szFileName)); MOCK_METHOD1(EF_ReloadFile_Request, diff --git a/Code/Legacy/CryCommon/Mocks/ISystemMock.h b/Code/Legacy/CryCommon/Mocks/ISystemMock.h index d891365696..9e4b7c99ec 100644 --- a/Code/Legacy/CryCommon/Mocks/ISystemMock.h +++ b/Code/Legacy/CryCommon/Mocks/ISystemMock.h @@ -122,7 +122,7 @@ public: const SFileVersion&()); MOCK_METHOD1(AddCVarGroupDirectory, - void(const string&)); + void(const AZStd::string&)); MOCK_METHOD0(SaveConfiguration, void()); MOCK_METHOD3(LoadConfiguration, diff --git a/Code/Legacy/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp index a60dbdf00b..fe9c539569 100644 --- a/Code/Legacy/CryCommon/WinBase.cpp +++ b/Code/Legacy/CryCommon/WinBase.cpp @@ -349,23 +349,23 @@ void _makepath(char* path, const char* drive, const char* dir, const char* filen } if (dir && dir[0]) { - cry_strcat(tmp, dir); + azstrcat(tmp, dir); ch = tmp[strlen(tmp) - 1]; if (ch != '/' && ch != '\\') { - cry_strcat(tmp, "\\"); + azstrcat(tmp, "\\"); } } if (filename && filename[0]) { - cry_strcat(tmp, filename); + azstrcat(tmp, filename); if (ext && ext[0]) { if (ext[0] != '.') { - cry_strcat(tmp, "."); + azstrcat(tmp, "."); } - cry_strcat(tmp, ext); + azstrcat(tmp, ext); } } azstrcpy(path, strlen(tmp) + 1, tmp); diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp index 6badd2fe1e..1523622538 100644 --- a/Code/Legacy/CryCommon/platform_impl.cpp +++ b/Code/Legacy/CryCommon/platform_impl.cpp @@ -499,7 +499,7 @@ inline void CryDebugStr([[maybe_unused]] const char* format, ...) va_start(ArgList, format); azvsnprintf(szBuffer,sizeof(szBuffer)-1, format, ArgList); va_end(ArgList); - cry_strcat(szBuffer,"\n"); + azstrcat(szBuffer,"\n"); OutputDebugString(szBuffer); #endif */ diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp index f5e946be43..2348e78a0e 100644 --- a/Code/Legacy/CrySystem/XConsole.cpp +++ b/Code/Legacy/CrySystem/XConsole.cpp @@ -1545,7 +1545,7 @@ const char* CXConsole::GetFlagsString(const uint32 dwFlags) static char sFlags[256]; // hiding this makes it a bit more difficult for cheaters - // if(dwFlags&VF_CHEAT) cry_strcat( sFlags,"CHEAT, "); + // if(dwFlags&VF_CHEAT) azstrcat( sFlags,"CHEAT, "); azstrcpy(sFlags, ""); diff --git a/Code/Tools/CrashHandler/Support/include/CrashSupport.h b/Code/Tools/CrashHandler/Support/include/CrashSupport.h index 9932d950d4..1393930913 100644 --- a/Code/Tools/CrashHandler/Support/include/CrashSupport.h +++ b/Code/Tools/CrashHandler/Support/include/CrashSupport.h @@ -11,6 +11,8 @@ #pragma once #include +#include +#include #include #include @@ -23,30 +25,24 @@ namespace CrashHandler { std::string GetTimeString(); - void GetExecutablePathA(char* pathBuffer, int& bufferSize); - void GetExecutablePathW(wchar_t* pathBuffer, int& bufferSize); void GetTimeInfo(tm& curTime); - template - inline void GetExecutablePath(T& returnPath) + inline void GetExecutablePath(std::string& returnPath) { char currentFileName[CRASH_HANDLER_MAX_PATH_LEN] = { 0 }; - int bufferLen{ CRASH_HANDLER_MAX_PATH_LEN }; - GetExecutablePathA(currentFileName, bufferLen); + AZ::Utils::GetExecutablePath(currentFileName, CRASH_HANDLER_MAX_PATH_LEN); returnPath = currentFileName; std::replace(returnPath.begin(), returnPath.end(), '\\', '/'); } - template <> - inline void GetExecutablePath(std::wstring& returnPath) + inline void GetExecutablePath(std::wstring& returnPathW) { - wchar_t currentFileName[CRASH_HANDLER_MAX_PATH_LEN] = { 0 }; - int bufferLen{ CRASH_HANDLER_MAX_PATH_LEN }; - GetExecutablePathW(currentFileName, bufferLen); - - returnPath = currentFileName; - std::replace(returnPath.begin(), returnPath.end(), '\\', '/'); + std::string returnPath; + GetExecutablePath(returnPath); + wchar_t currentFileNameW[CRASH_HANDLER_MAX_PATH_LEN] = { 0 }; + AZStd::to_wstring(currentFileNameW, CRASH_HANDLER_MAX_PATH_LEN, returnPath.c_str(), returnPath.size()); + returnPathW = currentFileNameW; } template diff --git a/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp index 933633b5e3..bee94ed116 100644 --- a/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp +++ b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp @@ -32,6 +32,7 @@ #include #include #endif +#include namespace Blast { diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp index f9ce0e522f..ae0880e98e 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp @@ -2362,10 +2362,10 @@ void CUiAnimViewDopeSheetBase::DrawKeys(CUiAnimViewTrack* pTrack, QPainter* pain } else { - cry_strcpy(keydesc, "{"); + azstrcpy(keydesc, "{"); } - cry_strcat(keydesc, pDescription); - cry_strcat(keydesc, "}"); + azstrcat(keydesc, pDescription); + azstrcat(keydesc, "}"); // Draw key description text. // Find next key. const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom())); diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h index 4df6021aa9..5ad3ab6f94 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h @@ -144,7 +144,7 @@ private: { public: BehaviorPropertyInfo() {} - BehaviorPropertyInfo(const string& name) + BehaviorPropertyInfo(const AZStd::string& name) { *this = name; } @@ -154,7 +154,7 @@ private: m_animNodeParamInfo.paramType = other.m_displayName; m_animNodeParamInfo.name = &m_displayName[0]; } - BehaviorPropertyInfo& operator=(const string& str) + BehaviorPropertyInfo& operator=(const AZStd::string& str) { // TODO: clean this up - this weird memory sharing was copied from legacy Cry - could be better. m_displayName = str; @@ -163,7 +163,7 @@ private: return *this; } - string m_displayName; + AZStd::string m_displayName; SParamInfo m_animNodeParamInfo; }; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp index 78d878c0eb..fd7f99c9b3 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp @@ -39,7 +39,7 @@ public: virtual void GetDefault(bool& val) const = 0; virtual void GetDefault(Vec4& val) const = 0; - string m_name; + AZStd::string m_name; protected: virtual ~CControlParamBase(){} diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp index e9f77f7947..23017e5779 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp @@ -98,10 +98,10 @@ void CAnimSequence::SetName(const char* name) return; // should never happen, null pointer guard } - string originalName = GetName(); + AZStd::string originalName = GetName(); m_name = name; - m_pMovieSystem->OnSequenceRenamed(originalName, m_name.c_str()); + m_pMovieSystem->OnSequenceRenamed(originalName.c_str(), m_name.c_str()); // the sequence named LIGHT_ANIMATION_SET_NAME is a singleton sequence to hold all light animations. if (m_name == LIGHT_ANIMATION_SET_NAME) @@ -744,9 +744,6 @@ void CAnimSequence::Deactivate() static_cast(animNode)->OnReset(); } - // Remove a possibly cached game hint associated with this anim sequence. - stack_string sTemp("anim_sequence_"); - sTemp += m_name.c_str(); // Audio: Release precached sound m_bActive = false; @@ -776,16 +773,6 @@ void CAnimSequence::PrecacheStatic(const float startTime) return; } - // Try to cache this sequence's game hint if one exists. - stack_string sTemp("anim_sequence_"); - sTemp += m_name.c_str(); - - //if (gEnv->pAudioSystem) - { - // Make sure to use the non-serializable game hint type as trackview sequences get properly reactivated after load - // Audio: Precache sound - } - gEnv->pLog->Log("=== Precaching render data for cutscene: %s ===", GetName()); m_precached = true; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h index 2c12f6e5ea..f69017c3a6 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h @@ -174,7 +174,7 @@ private: uint32 m_id; AZStd::string m_name; - mutable string m_fullNameHolder; + mutable AZStd::string m_fullNameHolder; Range m_timeRange; TrackEvents m_events; diff --git a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp index 4dd52a734a..62de2dfdf5 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp @@ -457,31 +457,31 @@ void CCompoundSplineTrack::GetKeyInfo(int key, const char*& description, float& { float dummy; m_subTracks[0]->GetKeyInfo(m, subDesc, dummy); - cry_strcat(str, subDesc); + azstrcat(str, subDesc); break; } } if (m == m_subTracks[0]->GetNumKeys()) { - cry_strcat(str, m_subTrackNames[0].c_str()); + azstrcat(str, m_subTrackNames[0].c_str()); } // Tail cases for (int i = 1; i < GetSubTrackCount(); ++i) { - cry_strcat(str, ","); + azstrcat(str, ","); for (m = 0; m < m_subTracks[i]->GetNumKeys(); ++m) { if (m_subTracks[i]->GetKeyTime(m) == time) { float dummy; m_subTracks[i]->GetKeyInfo(m, subDesc, dummy); - cry_strcat(str, subDesc); + azstrcat(str, subDesc); break; } } if (m == m_subTracks[i]->GetNumKeys()) { - cry_strcat(str, m_subTrackNames[i].c_str()); + azstrcat(str, m_subTrackNames[i].c_str()); } } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h index f22b0fb144..b0a2733316 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h @@ -108,7 +108,7 @@ public: virtual int NextKeyByTime(int key) const; - void SetSubTrackName(const int i, const string& name) { assert (i < MAX_SUBTRACKS); m_subTrackNames[i] = name; } + void SetSubTrackName(const int i, const AZStd::string& name) { assert (i < MAX_SUBTRACKS); m_subTrackNames[i] = name; } #ifdef MOVIESYSTEM_SUPPORT_EDITING virtual ColorB GetCustomColor() const diff --git a/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp index 278833cfe2..36d468e36d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp @@ -72,8 +72,8 @@ void CEventTrack::GetKeyInfo(int key, const char*& description, float& duration) azstrcpy(desc, m_keys[key].event.c_str()); if (!m_keys[key].eventValue.empty()) { - cry_strcat(desc, ", "); - cry_strcat(desc, m_keys[key].eventValue.c_str()); + azstrcat(desc, ", "); + azstrcat(desc, m_keys[key].eventValue.c_str()); } description = desc; diff --git a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h index 51d1b8be15..003312c426 100644 --- a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h @@ -58,7 +58,7 @@ private: float m_fMaxKeyValue; std::vector< CAnimNode::SParamInfo > m_dynamicShaderParamInfos; - typedef AZStd::unordered_map< string, size_t, stl::hash_string_caseless, stl::equality_string_caseless > TDynamicShaderParamsMap; + typedef AZStd::unordered_map, stl::equality_string_caseless > TDynamicShaderParamsMap; TDynamicShaderParamsMap m_nameToDynamicShaderParam; }; diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp index a6d9e47eb1..b7fb82e0e7 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp @@ -75,19 +75,19 @@ static SMovieSequenceAutoComplete s_movieSequenceAutoComplete; // Serialization for anim nodes & param types #define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.find(AnimNodeType::name) == g_animNodeEnumToStringMap.end()); \ g_animNodeEnumToStringMap[AnimNodeType::name] = STRINGIFY(name); \ - g_animNodeStringToEnumMap[string(STRINGIFY(name))] = AnimNodeType::name; + g_animNodeStringToEnumMap[AZStd::string(STRINGIFY(name))] = AnimNodeType::name; #define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.find(AnimParamType::name) == g_animParamEnumToStringMap.end()); \ g_animParamEnumToStringMap[AnimParamType::name] = STRINGIFY(name); \ - g_animParamStringToEnumMap[string(STRINGIFY(name))] = AnimParamType::name; + g_animParamStringToEnumMap[AZStd::string(STRINGIFY(name))] = AnimParamType::name; namespace { - AZStd::unordered_map g_animNodeEnumToStringMap; - StaticInstance >> g_animNodeStringToEnumMap; + AZStd::unordered_map g_animNodeEnumToStringMap; + StaticInstance >> g_animNodeStringToEnumMap; - AZStd::unordered_map g_animParamEnumToStringMap; - StaticInstance >> g_animParamStringToEnumMap; + AZStd::unordered_map g_animParamEnumToStringMap; + StaticInstance >> g_animParamStringToEnumMap; // If you get an assert in this function, it means two node types have the same enum value. void RegisterNodeTypes() @@ -1479,8 +1479,7 @@ void CMovieSystem::GoToFrame(const char* seqName, float targetFrame) if (gEnv->IsEditor() && gEnv->IsEditorGameMode() == false) { - string editorCmd; - editorCmd.Format("mov_goToFrameEditor %s %f", seqName, targetFrame); + AZStd::string editorCmd = AZStd::string::format("mov_goToFrameEditor %s %f", seqName, targetFrame); gEnv->pConsole->ExecuteString(editorCmd.c_str()); return; } @@ -1679,7 +1678,7 @@ void CMovieSystem::SerializeNodeType(AnimNodeType& animNodeType, XmlNodeRef& xml { const char* pTypeString = "Invalid"; assert(g_animNodeEnumToStringMap.find(animNodeType) != g_animNodeEnumToStringMap.end()); - pTypeString = g_animNodeEnumToStringMap[animNodeType]; + pTypeString = g_animNodeEnumToStringMap[animNodeType].c_str(); xmlNode->setAttr(kType, pTypeString); } } @@ -1780,7 +1779,7 @@ void CMovieSystem::SaveParamTypeToXml(const CAnimParamType& animParamType, XmlNo } assert(g_animParamEnumToStringMap.find(animParamType.m_type) != g_animParamEnumToStringMap.end()); - pTypeString = g_animParamEnumToStringMap[animParamType.m_type]; + pTypeString = g_animParamEnumToStringMap[animParamType.m_type].c_str(); } xmlNode->setAttr(kParamType, pTypeString); @@ -1815,7 +1814,7 @@ const char* CMovieSystem::GetParamTypeName(const CAnimParamType& animParamType) { if (g_animParamEnumToStringMap.find(animParamType.m_type) != g_animParamEnumToStringMap.end()) { - return g_animParamEnumToStringMap[animParamType.m_type]; + return g_animParamEnumToStringMap[animParamType.m_type].c_str(); } } @@ -1970,7 +1969,7 @@ CLightAnimWrapper* CLightAnimWrapper::FindLightAnim(const char* name) ////////////////////////////////////////////////////////////////////////// void CLightAnimWrapper::CacheLightAnim(const char* name, CLightAnimWrapper* p) { - ms_lightAnimWrapperCache.insert(LightAnimWrapperCache::value_type(string(name), p)); + ms_lightAnimWrapperCache.insert(LightAnimWrapperCache::value_type(AZStd::string(name), p)); } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp index 9e3fe212df..799747eb12 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp @@ -917,7 +917,7 @@ void CAnimSceneNode::ApplyEventKey(IEventKey& key, [[maybe_unused]] SAnimContext { char funcName[1024]; azstrcpy(funcName, "Event_"); - cry_strcat(funcName, key.event.c_str()); + azstrcat(funcName, key.event.c_str()); gEnv->pMovieSystem->SendGlobalEvent(funcName); } @@ -1003,7 +1003,7 @@ void CAnimSceneNode::ApplyGotoKey(CGotoTrack* poGotoTrack, SAnimContext& ec) { if (stDiscreteFloadKey.m_fValue >= 0) { - string fullname = m_pSequence->GetName(); + AZStd::string fullname = m_pSequence->GetName(); GetMovieSystem()->GoToFrame(fullname.c_str(), stDiscreteFloadKey.m_fValue); } } diff --git a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp index af5b931dec..3541fe718e 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp @@ -32,7 +32,7 @@ void CScreenFaderTrack::GetKeyInfo(int key, const char*& description, float& dur CheckValid(); description = 0; duration = m_keys[key].m_fadeTime; - cry_strcpy(desc, m_keys[key].m_fadeType == IScreenFaderKey::eFT_FadeIn ? "In" : "Out"); + azstrcpy(desc, m_keys[key].m_fadeType == IScreenFaderKey::eFT_FadeIn ? "In" : "Out"); description = desc; } diff --git a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp index 3eca733a1d..25d709bcdc 100644 --- a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp @@ -146,8 +146,8 @@ void CTrackEventTrack::GetKeyInfo(int key, const char*& description, float& dura azstrcpy(desc, m_keys[key].event.c_str()); if (!m_keys[key].eventValue.empty()) { - cry_strcat(desc, ", "); - cry_strcat(desc, m_keys[key].eventValue.c_str()); + azstrcat(desc, ", "); + azstrcat(desc, m_keys[key].eventValue.c_str()); } description = desc;