diff --git a/Engine/source/sim/actionMap.h b/Engine/source/sim/actionMap.h index c2c4cbd72..26caffe7b 100644 --- a/Engine/source/sim/actionMap.h +++ b/Engine/source/sim/actionMap.h @@ -92,7 +92,7 @@ class ActionMap : public SimObject U32 deviceInst; Vector nodeMap; - DeviceMap() { + DeviceMap():deviceType(NULL), deviceInst(NULL){ VECTOR_SET_ASSOCIATION(nodeMap); } ~DeviceMap(); diff --git a/Engine/source/sim/netConnection.cpp b/Engine/source/sim/netConnection.cpp index c952a0258..9d70ff2dc 100644 --- a/Engine/source/sim/netConnection.cpp +++ b/Engine/source/sim/netConnection.cpp @@ -469,6 +469,8 @@ NetConnection::PacketNotify::PacketNotify() sendTime = 0; eventList = 0; ghostList = 0; + subList = NULL; + nextPacket = NULL; } bool NetConnection::checkTimeout(U32 time) diff --git a/Engine/source/sim/netConnection.h b/Engine/source/sim/netConnection.h index 55422f9eb..ab58ac0e0 100644 --- a/Engine/source/sim/netConnection.h +++ b/Engine/source/sim/netConnection.h @@ -273,7 +273,7 @@ public: /// @{ /// - NetEvent() { mGuaranteeType = GuaranteedOrdered; } + NetEvent() { mSourceId = -1; mGuaranteeType = GuaranteedOrdered; } virtual ~NetEvent(); virtual void write(NetConnection *ps, BitStream *bstream) = 0; @@ -863,7 +863,7 @@ public: void setScopeObject(NetObject *object); /// Get the object around which we are currently scoping network traffic. - NetObject *getScopeObject(); + NetObject* getScopeObject() {}; /// Add an object to scope. void objectInScope(NetObject *object); @@ -1047,7 +1047,7 @@ public: bool startDemoRecord(const char *fileName); bool replayDemoRecord(const char *fileName); - void startDemoRead(); + void startDemoRead() {}; void stopRecording(); void stopDemoPlayback(); diff --git a/Engine/source/sim/netInterface.cpp b/Engine/source/sim/netInterface.cpp index fd2c51bc4..e11d65383 100644 --- a/Engine/source/sim/netInterface.cpp +++ b/Engine/source/sim/netInterface.cpp @@ -42,7 +42,8 @@ NetInterface::NetInterface() mLastTimeoutCheckTime = 0; mAllowConnections = false; - + dMemset(mRandomHashData, 0, sizeof(mRandomHashData)); + mRandomDataInitialized = false; } void NetInterface::initRandomData() diff --git a/Engine/source/sim/netStringTable.h b/Engine/source/sim/netStringTable.h index 948d497ce..a3cc9f530 100644 --- a/Engine/source/sim/netStringTable.h +++ b/Engine/source/sim/netStringTable.h @@ -64,7 +64,6 @@ class NetStringTable U32 size; U32 firstFree; U32 firstValid; - U32 sequenceCount; Entry *table; U32 hashTable[HashTableSize];