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
Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
+2 -2
View File
@@ -323,7 +323,7 @@ bool SRemoteServer::ReadBuffer(const char* buffer, int data)
}
// Advance to the next null terminated string in the buffer
const int currentSize = strnlen(curBuffer, bytesRemaining);
const int currentSize = static_cast<int>(strnlen(curBuffer, bytesRemaining));
bytesRemaining -= currentSize + 1;
curBuffer += currentSize + 1;
}
@@ -466,7 +466,7 @@ void SRemoteClient::FillAutoCompleteList(AZStd::vector<AZStd::string>& list)
AZStd::string item = "map ";
const char* levelName = pLevel->GetName();
int start = 0;
for (int k = 0, kend = strlen(levelName); k < kend; ++k)
for (int k = 0, kend = static_cast<int>(strlen(levelName)); k < kend; ++k)
{
if ((levelName[k] == '\\' || levelName[k] == '/') && k + 1 < kend)
{