TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/app/badWordFilter.cpp
View file

@ -50,7 +50,7 @@ BadWordFilter::BadWordFilter()
{
VECTOR_SET_ASSOCIATION( filterTables );
dStrcpy(defaultReplaceStr, "knqwrtlzs");
dStrcpy(defaultReplaceStr, "knqwrtlzs", 32);
filterTables.push_back(new FilterTable);
curOffset = 0;
}
@ -147,7 +147,7 @@ bool BadWordFilter::setDefaultReplaceStr(const char *str)
U32 len = dStrlen(str);
if(len < 2 || len >= sizeof(defaultReplaceStr))
return false;
dStrcpy(defaultReplaceStr, str);
dStrcpy(defaultReplaceStr, str, 32);
return true;
}
@ -286,8 +286,9 @@ DefineEngineFunction(filterString, const char *, (const char* baseString, const
else
replaceStr = gBadWordFilter->getDefaultReplaceStr();
char *ret = Con::getReturnBuffer(dStrlen(baseString) + 1);
dStrcpy(ret, baseString);
dsize_t retLen = dStrlen(baseString) + 1;
char *ret = Con::getReturnBuffer(retLen);
dStrcpy(ret, baseString, retLen);
gBadWordFilter->filterString(ret, replaceStr);
return ret;
}

2
Engine/source/app/banList.cpp
View file

@ -86,7 +86,7 @@ void BanList::addBan(S32 uniqueId, const char *TA, S32 banTime)
}
BanInfo b;
dStrcpy(b.transportAddress, TA);
dStrcpy(b.transportAddress, TA, 128);
b.uniqueId = uniqueId;
b.bannedUntil = banTime;

2
Engine/source/app/mainLoop.cpp
View file

@ -495,7 +495,7 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv )
S32 pathLen = dStrlen( fdd.mFile );
FrameTemp<char> szPathCopy( pathLen + 1);
dStrcpy( szPathCopy, fdd.mFile );
dStrcpy( szPathCopy, fdd.mFile, pathLen + 1 );
//forwardslash( szPathCopy );
const char *path = dStrrchr(szPathCopy, '/');

10
Engine/source/app/net/net.cpp
View file

@ -128,8 +128,8 @@
const char *rmtCommandName = dStrchr(mArgv[1], ' ') + 1;
if(conn->isConnectionToServer())
{
dStrcpy(mBuf, "clientCmd");
dStrcat(mBuf, rmtCommandName);
dStrcpy(mBuf, "clientCmd", 1024);
dStrcat(mBuf, rmtCommandName, 1024);
char *temp = mArgv[1];
mArgv[1] = mBuf;
@ -139,8 +139,8 @@
}
else
{
dStrcpy(mBuf, "serverCmd");
dStrcat(mBuf, rmtCommandName);
dStrcpy(mBuf, "serverCmd", 1024);
dStrcat(mBuf, rmtCommandName, 1024);
char *temp = mArgv[1];
dSprintf(idBuf, sizeof(idBuf), "%d", conn->getId());
@ -409,7 +409,7 @@ ConsoleFunction( buildTaggedString, const char*, 2, 11, "(string format, ...)"
S32 strLength = dStrlen(argStr);
if (strLength > strMaxLength)
goto done;
dStrcpy(strBufPtr, argStr);
dStrcpy(strBufPtr, argStr, strMaxLength);
strBufPtr += strLength;
strMaxLength -= strLength;
fmtStrPtr += 2;

4
Engine/source/app/net/netExamples.cpp
View file

@ -110,7 +110,7 @@ public:
SimpleNetObject()
{
mNetFlags.set(ScopeAlways | Ghostable);
dStrcpy(message, "Hello World!");
dStrcpy(message, "Hello World!", 256);
}
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
{
@ -125,7 +125,7 @@ public:
void setMessage(const char *msg)
{
setMaskBits(1);
dStrcpy(message, msg);
dStrcpy(message, msg, 256);
}
DECLARE_CONOBJECT(SimpleNetObject);

71
Engine/source/app/net/serverQuery.cpp
View file

@ -394,12 +394,12 @@ void queryLanServers(U32 port, U8 flags, const char* gameType, const char* missi
if ( !sActiveFilter.gameType || dStricmp( sActiveFilter.gameType, "Any" ) != 0 )
{
sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, 4 );
dStrcpy( sActiveFilter.gameType, "Any" );
dStrcpy( sActiveFilter.gameType, "Any", 4 );
}
if ( !sActiveFilter.missionType || dStricmp( sActiveFilter.missionType, "Any" ) != 0 )
{
sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, 4 );
dStrcpy( sActiveFilter.missionType, "Any" );
dStrcpy( sActiveFilter.missionType, "Any", 4 );
}
sActiveFilter.queryFlags = 0;
sActiveFilter.minPlayers = minPlayers;
@ -510,14 +510,16 @@ void queryMasterServer(U8 flags, const char* gameType, const char* missionType,
// Update the active filter:
if ( !sActiveFilter.gameType || dStrcmp( sActiveFilter.gameType, gameType ) != 0 )
{
sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, dStrlen( gameType ) + 1 );
dStrcpy( sActiveFilter.gameType, gameType );
dsize_t gameTypeLen = dStrlen(gameType) + 1;
sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, gameTypeLen );
dStrcpy( sActiveFilter.gameType, gameType, gameTypeLen );
}
if ( !sActiveFilter.missionType || dStrcmp( sActiveFilter.missionType, missionType ) != 0 )
{
sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, dStrlen( missionType ) + 1 );
dStrcpy( sActiveFilter.missionType, missionType );
dsize_t missionTypeLen = dStrlen(missionType) + 1;
sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, missionTypeLen );
dStrcpy( sActiveFilter.missionType, missionType, missionTypeLen );
}
sActiveFilter.queryFlags = flags | ServerFilter::NewStyleResponse;
@ -969,8 +971,9 @@ static void pushServerFavorites()
Net::stringToAddress( addrString, &addr );
ServerInfo* si = findOrCreateServerInfo( &addr );
AssertFatal(si, "pushServerFavorites - failed to create Server Info!" );
si->name = (char*) dRealloc( (void*) si->name, dStrlen( serverName ) + 1 );
dStrcpy( si->name, serverName );
dsize_t nameLen = dStrlen(serverName) + 1;
si->name = (char*) dRealloc( (void*) si->name, nameLen );
dStrcpy( si->name, serverName, nameLen );
si->isFavorite = true;
pushPingRequest( &addr );
}
@ -1053,14 +1056,15 @@ void addFakeServers( S32 howMany )
newServer.maxPlayers = 64;
char buf[256];
dSprintf( buf, 255, "Fake server #%d", sNumFakeServers );
newServer.name = (char*) dMalloc( dStrlen( buf ) + 1 );
dStrcpy( newServer.name, buf );
dsize_t nameLen = dStrlen(buf) + 1;
newServer.name = (char*) dMalloc( nameLen );
dStrcpy( newServer.name, buf, nameLen );
newServer.gameType = (char*) dMalloc( 5 );
dStrcpy( newServer.gameType, "Fake" );
newServer.missionType = (char*) dMalloc( 4 );
dStrcpy( newServer.missionType, "FakeMissionType" );
dStrcpy( newServer.gameType, "Fake", 5 );
newServer.missionType = (char*) dMalloc( 16 );
dStrcpy( newServer.missionType, "FakeMissionType", 16 );
newServer.missionName = (char*) dMalloc( 14 );
dStrcpy( newServer.missionName, "FakeMapName" );
dStrcpy( newServer.missionName, "FakeMapName", 14 );
Net::stringToAddress( "IP:198.74.33.35:28000", &newServer.address );
newServer.ping = (U32)( Platform::getRandom() * 200.0f );
newServer.cpuSpeed = 470;
@ -1353,9 +1357,9 @@ static void processPingsAndQueries( U32 session, bool schedule )
char msg[64];
U32 foundCount = gServerList.size();
if ( foundCount == 0 )
dStrcpy( msg, "No servers found." );
dStrcpy( msg, "No servers found.", 64 );
else if ( foundCount == 1 )
dStrcpy( msg, "One server found." );
dStrcpy( msg, "One server found.", 64 );
else
dSprintf( msg, sizeof( msg ), "%d servers found.", foundCount );
@ -1753,8 +1757,9 @@ static void handleGameMasterInfoRequest( const NetAddress* address, U32 key, U8
out->write( playerCount );
const char* guidList = Con::getVariable( "Server::GuidList" );
char* buf = new char[dStrlen( guidList ) + 1];
dStrcpy( buf, guidList );
dsize_t bufLen = dStrlen(guidList) + 1;
char* buf = new char[bufLen];
dStrcpy( buf, guidList, bufLen );
char* temp = dStrtok( buf, "\t" );
temp8 = 0;
for ( ; temp && temp8 < playerCount; temp8++ )
@ -1948,8 +1953,9 @@ static void handleGamePingResponse( const NetAddress* address, BitStream* stream
stream->readString( buf );
if ( !si->name )
{
si->name = (char*) dMalloc( dStrlen( buf ) + 1 );
dStrcpy( si->name, buf );
dsize_t bufLen = dStrlen(buf) + 1;
si->name = (char*) dMalloc(bufLen);
dStrcpy( si->name, buf, bufLen );
}
// Set the server up to be queried:
@ -2050,8 +2056,9 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
stream->readString( stringBuf );
if ( !si->gameType || dStricmp( si->gameType, stringBuf ) != 0 )
{
si->gameType = (char*) dRealloc( (void*) si->gameType, dStrlen( stringBuf ) + 1 );
dStrcpy( si->gameType, stringBuf );
dsize_t gameTypeLen = dStrlen(stringBuf) + 1;
si->gameType = (char*) dRealloc( (void*) si->gameType, gameTypeLen );
dStrcpy( si->gameType, stringBuf, gameTypeLen );
// Test against the active filter:
if ( applyFilter && dStricmp( sActiveFilter.gameType, "any" ) != 0
@ -2067,8 +2074,9 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
stream->readString( stringBuf );
if ( !si->missionType || dStrcmp( si->missionType, stringBuf ) != 0 )
{
si->missionType = (char*) dRealloc( (void*) si->missionType, dStrlen( stringBuf ) + 1 );
dStrcpy( si->missionType, stringBuf );
dsize_t missionTypeLen = dStrlen(stringBuf) + 1;
si->missionType = (char*) dRealloc( (void*) si->missionType, missionTypeLen );
dStrcpy( si->missionType, stringBuf, missionTypeLen );
// Test against the active filter:
if ( applyFilter && dStricmp( sActiveFilter.missionType, "any" ) != 0
@ -2088,8 +2096,9 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
*temp = '\0';
if ( !si->missionName || dStrcmp( si->missionName, stringBuf ) != 0 )
{
si->missionName = (char*) dRealloc( (void*) si->missionName, dStrlen( stringBuf ) + 1 );
dStrcpy( si->missionName, stringBuf );
dsize_t missionNameLen = dStrlen(stringBuf) + 1;
si->missionName = (char*) dRealloc( (void*) si->missionName, missionNameLen );
dStrcpy( si->missionName, stringBuf, missionNameLen );
}
// Get the server status:
@ -2157,16 +2166,18 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
stream->readString( stringBuf );
if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) )
{
si->infoString = (char*) dRealloc( (void*) si->infoString, dStrlen( stringBuf ) + 1 );
dStrcpy( si->infoString, stringBuf );
dsize_t infoLen = dStrlen(stringBuf) + 1;
si->infoString = (char*) dRealloc( (void*) si->infoString, infoLen );
dStrcpy( si->infoString, stringBuf, infoLen );
}
// Get the content string:
readLongCString( stream, stringBuf );
if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) )
{
si->statusString = (char*) dRealloc( (void*) si->statusString, dStrlen( stringBuf ) + 1 );
dStrcpy( si->statusString, stringBuf );
dsize_t statusLen = dStrlen(stringBuf) + 1;
si->statusString = (char*) dRealloc( (void*) si->statusString, statusLen );
dStrcpy( si->statusString, stringBuf, statusLen );
}
// Update the server browser gui!