diff --git a/NifProps/NifProps.cpp b/NifProps/NifProps.cpp index 583db25c7977a3ff4add9594697c0b17e6a90262..10a0168310733a46ebfe0dd16c7f4fb9618abcea 100755 --- a/NifProps/NifProps.cpp +++ b/NifProps/NifProps.cpp @@ -27,8 +27,8 @@ public: void selectionChanged(); - BOOL dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); - BOOL dlgAnimProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + INT_PTR dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + INT_PTR dlgAnimProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); private: @@ -74,12 +74,12 @@ ClassDesc2* GetNifPropsDesc() { return &NifPropsDesc; } -static BOOL CALLBACK NifPropsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK NifPropsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return plugin.dlgProc(hWnd, msg, wParam, lParam); } -static BOOL CALLBACK NifAnimPropsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK NifAnimPropsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return plugin.dlgAnimProc(hWnd, msg, wParam, lParam); } @@ -303,7 +303,7 @@ void NifProps::Destroy(HWND hWnd) } -BOOL NifProps::dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR NifProps::dlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { Vector3 center; diff --git a/NifProps/bhkRigidBodyInterface.cpp b/NifProps/bhkRigidBodyInterface.cpp index 8fce37c3c23dd7dc5bcefb22057e829cfddc42b1..bd298ec8d10f2b67e1efef88718602404f5045a5 100644 --- a/NifProps/bhkRigidBodyInterface.cpp +++ b/NifProps/bhkRigidBodyInterface.cpp @@ -550,7 +550,7 @@ void bhkRigidBodyIfcHelper::SetQualityType(int value, TimeValue time) } int bhkRigidBodyIfcHelper::GetQualityType(TimeValue time, Interval& valid) const { - float value = NP_DEFAULT_HVK_QUALITY_TYPE; + int value = NP_DEFAULT_HVK_QUALITY_TYPE; rbpblock->GetValue(PB_RB_QUALITY_TYPE,time,value,valid); return value; }