diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp index 2069be0f2..765c15b92 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp +++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp @@ -1086,6 +1086,9 @@ void WheeledVehicle::updateForces(F32 dt) if (mJetting) mRigid.force += by * mDataBlock->jetForce; + // Add in force from physical zones... + mRigid.force += mAppliedForce; + // Container drag & buoyancy mRigid.force += Point3F(0, 0, -mBuoyancy * sWheeledVehicleGravity * mRigid.mass); mRigid.force -= mRigid.linVelocity * mDrag; diff --git a/Engine/source/gui/controls/guiTextCtrl.cpp b/Engine/source/gui/controls/guiTextCtrl.cpp index 1b8c8e9e0..e1079d8e0 100644 --- a/Engine/source/gui/controls/guiTextCtrl.cpp +++ b/Engine/source/gui/controls/guiTextCtrl.cpp @@ -187,8 +187,10 @@ void GuiTextCtrl::setText(const char *txt) //make sure we don't call this before onAdd(); if( !mProfile ) return; - - if (txt) + + // The txt pointer is sometimes the same as the mText pointer, so make sure + // we don't call strncpy with overlapping src and dest. + if (txt && txt != mText) dStrncpy(mText, (UTF8*)txt, MAX_STRING_LENGTH); mText[MAX_STRING_LENGTH] = '\0'; diff --git a/Engine/source/platformWin32/winFileio.cpp b/Engine/source/platformWin32/winFileio.cpp index 36900cd15..0aeab392d 100644 --- a/Engine/source/platformWin32/winFileio.cpp +++ b/Engine/source/platformWin32/winFileio.cpp @@ -1306,8 +1306,10 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve // Compose our search string - Format : ([path]/[subpath]/*) //----------------------------------------------------------------------------- - char trail = basePath[ dStrlen(basePath) - 1 ]; - char subTrail = subPath ? subPath[ dStrlen(subPath) - 1 ] : '\0'; + dsize_t trLen = basePath ? dStrlen(basePath) : 0; + dsize_t subtrLen = subPath ? dStrlen(subPath) : 0; + char trail = trLen > 0 ? basePath[ trLen - 1 ] : '\0'; + char subTrail = subtrLen > 0 ? subPath[ subtrLen - 1 ] : '\0'; if( trail == '/' ) { diff --git a/Templates/Full/game/scripts/client/init.cs b/Templates/Full/game/scripts/client/init.cs index 56da1c945..2df6e2140 100644 --- a/Templates/Full/game/scripts/client/init.cs +++ b/Templates/Full/game/scripts/client/init.cs @@ -72,7 +72,6 @@ function initClient() configureCanvas(); // Load up the Game GUIs - exec("art/gui/defaultGameProfiles.cs"); exec("art/gui/playGui.gui"); exec("art/gui/chatHud.gui"); exec("art/gui/playerList.gui");