birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-05 20:05:25 -07:00
parent 4358b6eb27 6b2452379f
commit e28d04aea6
389 changed files with 5267 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.inl
+2 -2
View File
@@ -300,7 +300,7 @@ namespace GameStateSamples
// Add all the levels into the UI as buttons
UiDynamicLayoutBus::Event(dynamicLayoutElementId, &UiDynamicLayoutInterface::SetNumChildElements, levelNames.size());
UiDynamicLayoutBus::Event(dynamicLayoutElementId, &UiDynamicLayoutInterface::SetNumChildElements, static_cast<int>(levelNames.size()));
for (int i = 0; i < levelNames.size(); ++i)
{
AZ::IO::PathView level(levelNames[i].c_str());
@@ -334,7 +334,7 @@ namespace GameStateSamples
{
// Get the level name (strip folder names from the path)
const char* levelPath = levelSystem->GetLevelInfo(i)->GetName();
const int levelPathLength = strlen(levelPath);
const int levelPathLength = static_cast<int>(strlen(levelPath));
const char* levelName = levelPath;
for (int j = 0; j < levelPathLength; ++j)
{