diff --git a/Engine/source/platform/async/asyncPacketQueue.h b/Engine/source/platform/async/asyncPacketQueue.h index 513d6ab29..3bf36e9a5 100644 --- a/Engine/source/platform/async/asyncPacketQueue.h +++ b/Engine/source/platform/async/asyncPacketQueue.h @@ -164,9 +164,7 @@ class AsyncPacketQueue mConsumer( consumer ) { - #ifdef TORQUE_DEBUG mTotalQueuedPackets = 0; - #endif } /// Return true if there are currently diff --git a/Engine/source/platform/nativeDialogs/fileDialog.cpp b/Engine/source/platform/nativeDialogs/fileDialog.cpp index 067458e9f..4e85cbf07 100644 --- a/Engine/source/platform/nativeDialogs/fileDialog.cpp +++ b/Engine/source/platform/nativeDialogs/fileDialog.cpp @@ -54,6 +54,7 @@ FileDialogData::FileDialogData() mTitle = StringTable->EmptyString(); mStyle = 0; + mOpaqueData = NULL; } FileDialogData::~FileDialogData() @@ -123,6 +124,7 @@ FileDialog::FileDialog() : mData() mData.mStyle = FileDialogData::FDS_OPEN | FileDialogData::FDS_MUSTEXIST; mChangePath = false; mForceRelativePath = true; + mBoolTranslator = false; } FileDialog::~FileDialog() diff --git a/Engine/source/platformSDL/threads/thread.cpp b/Engine/source/platformSDL/threads/thread.cpp index 08409fe11..a7de28753 100644 --- a/Engine/source/platformSDL/threads/thread.cpp +++ b/Engine/source/platformSDL/threads/thread.cpp @@ -83,6 +83,7 @@ Thread::Thread(ThreadRunFunction func, void* arg, bool start_thread, bool autode mData->mDead = false; mData->mSdlThread = NULL; autoDelete = autodelete; + shouldStop = true; } Thread::~Thread() diff --git a/Engine/source/platformWin32/winAsync.cpp b/Engine/source/platformWin32/winAsync.cpp index 8910ee420..277b698fe 100644 --- a/Engine/source/platformWin32/winAsync.cpp +++ b/Engine/source/platformWin32/winAsync.cpp @@ -59,6 +59,7 @@ AsyncPeriodicUpdateThread::AsyncPeriodicUpdateThread( String name, // This is a bit contrived. The 'dueTime' is in 100 nanosecond intervals // and relative if it is negative. The period is in milliseconds. + mIntervalMS = intervalMS; LARGE_INTEGER deltaTime; deltaTime.QuadPart = - LONGLONG( intervalMS * 10 /* micro */ * 1000 /* milli */ ); diff --git a/Engine/source/platformWin32/winDirectInput.cpp b/Engine/source/platformWin32/winDirectInput.cpp index fd016496f..b5ba6d2ce 100644 --- a/Engine/source/platformWin32/winDirectInput.cpp +++ b/Engine/source/platformWin32/winDirectInput.cpp @@ -47,6 +47,13 @@ DInputManager::DInputManager() mJoystickActive = mXInputActive = true; mXInputLib = NULL; + mfnXInputGetState = NULL; + mfnXInputSetState = NULL; + dMemset(mXInputStateOld, 0, sizeof(mXInputStateOld)); + dMemset(mXInputStateNew, 0, sizeof(mXInputStateNew)); + mXInputStateReset = false; + mXInputDeadZoneOn = true; + for(S32 i=0; i<4; i++) mLastDisconnectTime[i] = -1; } diff --git a/Engine/source/platformWin32/winFont.cpp b/Engine/source/platformWin32/winFont.cpp index a67b096b3..2efdd6a08 100644 --- a/Engine/source/platformWin32/winFont.cpp +++ b/Engine/source/platformWin32/winFont.cpp @@ -129,6 +129,7 @@ PlatformFont *createPlatformFont(const char *name, dsize_t size, U32 charset /* WinFont::WinFont() : mFont(NULL) { + dMemset(&mTextMetric, 0, sizeof(mTextMetric)); } WinFont::~WinFont() diff --git a/Engine/source/platformWin32/winTimer.cpp b/Engine/source/platformWin32/winTimer.cpp index 940e2c7b8..77e820b07 100644 --- a/Engine/source/platformWin32/winTimer.cpp +++ b/Engine/source/platformWin32/winTimer.cpp @@ -49,11 +49,12 @@ public: mUsingPerfCounter = QueryPerformanceFrequency((LARGE_INTEGER *) &mFrequency); if(mUsingPerfCounter) mUsingPerfCounter = QueryPerformanceCounter((LARGE_INTEGER *) &mPerfCountCurrent); - if(!mUsingPerfCounter) - { + mPerfCountNext = 0.0; + if (!mUsingPerfCounter) mTickCountCurrent = GetTickCount(); - mTickCountNext = 0; - } + else + mTickCountCurrent = 0; + mTickCountNext = 0; } const S32 getElapsedMs()