From d97d44f66fa1d07caaa51e855c121d3016543300 Mon Sep 17 00:00:00 2001 From: Ben Payne Date: Mon, 10 Nov 2014 11:50:46 -0500 Subject: [PATCH] Fix more misc uninitialized vars --- Engine/source/T3D/gameBase/gameConnection.cpp | 2 ++ Engine/source/core/dnet.cpp | 1 + Engine/source/platformWin32/menus/popupMenuWin32.cpp | 4 ++-- Engine/source/sim/netConnection.cpp | 1 + Engine/source/util/settings.h | 5 ++++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/gameBase/gameConnection.cpp b/Engine/source/T3D/gameBase/gameConnection.cpp index 5888ec218..4c5eef912 100644 --- a/Engine/source/T3D/gameBase/gameConnection.cpp +++ b/Engine/source/T3D/gameBase/gameConnection.cpp @@ -208,6 +208,8 @@ GameConnection::GameConnection() mAIControlled = false; + mLastPacketTime = 0; + mDisconnectReason[0] = 0; //blackout vars diff --git a/Engine/source/core/dnet.cpp b/Engine/source/core/dnet.cpp index 324a9fcfd..b850bf5fd 100644 --- a/Engine/source/core/dnet.cpp +++ b/Engine/source/core/dnet.cpp @@ -66,6 +66,7 @@ ConnectionProtocol::ConnectionProtocol() mLastSendSeq = 0; // start sending at 1 mAckMask = 0; mLastRecvAckAck = 0; + mConnectionEstablished = false; } void ConnectionProtocol::buildSendPacketHeader(BitStream *stream, S32 packetType) { diff --git a/Engine/source/platformWin32/menus/popupMenuWin32.cpp b/Engine/source/platformWin32/menus/popupMenuWin32.cpp index f04ae1b58..883e2c0c3 100644 --- a/Engine/source/platformWin32/menus/popupMenuWin32.cpp +++ b/Engine/source/platformWin32/menus/popupMenuWin32.cpp @@ -158,7 +158,7 @@ void PopupMenu::createPlatformMenu() mData->mMenu = mIsPopup ? CreatePopupMenu() : CreateMenu(); AssertFatal(mData->mMenu, "Unable to create menu"); - MENUINFO mi; + MENUINFO mi = { 0 }; mi.cbSize = sizeof(mi); mi.fMask = MIM_MENUDATA; mi.dwMenuData = (ULONG_PTR)this; @@ -176,7 +176,7 @@ S32 PopupMenu::insertItem(S32 pos, const char *title, const char* accelerator) if(isAttached && pWindow == NULL) return -1; - MENUITEMINFOA mi; + MENUITEMINFOA mi = { 0 }; mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID|MIIM_TYPE; mi.wID = (mData->mMenuID * PlatformPopupMenuData::PopupMenuIDRange) + mData->mLastID + 1; diff --git a/Engine/source/sim/netConnection.cpp b/Engine/source/sim/netConnection.cpp index a34265e48..e882ef869 100644 --- a/Engine/source/sim/netConnection.cpp +++ b/Engine/source/sim/netConnection.cpp @@ -351,6 +351,7 @@ void NetConnection::setNetClassGroup(U32 grp) } NetConnection::NetConnection() + : mNetAddress() { mTranslateStrings = false; mConnectSequence = 0; diff --git a/Engine/source/util/settings.h b/Engine/source/util/settings.h index 2438504ac..10fe2305c 100644 --- a/Engine/source/util/settings.h +++ b/Engine/source/util/settings.h @@ -78,7 +78,10 @@ public: String mValue; bool mIsGroup; - SettingSaveNode(){}; + SettingSaveNode() + { + mIsGroup = false; + } SettingSaveNode(const String &name, bool isGroup = false) { mName = name;