From 3118e3d18bb051b65fcd57807059e5c46eed06c2 Mon Sep 17 00:00:00 2001
From: Lukas Cone <lukas.kuzel.ch@gmail.com>
Date: Mon, 13 May 2019 16:40:45 +0200
Subject: [PATCH] Master update 1

Upgrade to new HavokLib.
Changed explicit path to debug working directory for pos-build event.
Update README.md.
---
 3rd_party/HavokLib       |  2 +-
 HavokMax.vcxproj         |  3 +--
 HavokMax.vcxproj.filters |  3 ---
 README.md                | 21 +++++++++++----------
 src/DllEntry.cpp         |  3 +++
 src/HavokMax.h           |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/3rd_party/HavokLib b/3rd_party/HavokLib
index 0faec5e..2bc9950 160000
--- a/3rd_party/HavokLib
+++ b/3rd_party/HavokLib
@@ -1 +1 @@
-Subproject commit 0faec5e68b5ae3eb5fb37b4c5c61ab530a96d94d
+Subproject commit 2bc9950059172929541e5ea5cbd5b0ab31e784f6
diff --git a/HavokMax.vcxproj b/HavokMax.vcxproj
index fdc3956..b89d552 100644
--- a/HavokMax.vcxproj
+++ b/HavokMax.vcxproj
@@ -63,7 +63,6 @@
     <ResourceCompile Include="src\HavokMax.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="3rd_party\HavokLib\3rd_party\PreCore\datas\esString.cpp" />
     <ClCompile Include="src\DllEntry.cpp" />
     <ClCompile Include="src\HavokExport.cpp" />
     <ClCompile Include="src\HavokImport.cpp" />
@@ -144,7 +143,7 @@
       <OutputFile>$(OutDir)$(TargetName).dlu</OutputFile>
     </Link>
     <PostBuildEvent>
-      <Command>COPY /Y /V "$(OutDir)$(TargetName).dlu" /B "C:\Program Files\Autodesk\3ds Max $(Configuration)\Plugins\" /B</Command>
+      <Command>COPY /Y /V "$(OutDir)$(TargetName).dlu" /B "$(LocalDebuggerWorkingDirectory)Plugins\" /B</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/HavokMax.vcxproj.filters b/HavokMax.vcxproj.filters
index c1bc65f..ee20a3b 100644
--- a/HavokMax.vcxproj.filters
+++ b/HavokMax.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="3rd_party\HavokLib\3rd_party\PreCore\datas\esString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\HavokMax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/README.md b/README.md
index d1e9117..d0f26a3 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,21 @@
 # HavokMax
-HavokMax is Havok importer/exporter for 3ds max. Builded with VS2015.
+HavokMax is Havok importer/exporter for 3ds max.\
+Builded with VS2015.\
+Supported 3ds max versions: **2010 - 2019**\
+Tested on 3ds max versions: **2017**
 
-Supported 3ds max versions: 2010 - 2019
-
-Tested on 3ds max versions: 2017
-
-## Editing .vcxproj
+## Building
+### Editing .vcxproj
 All essential configurations are within **PropertyGroup Label="MAXConfigurations"** field.
 - **MaxSDK**: changes path where is your MAX SDK installation.
 If your MAX SDK installation is somewhere else than default path stated in this field, you can edit it here.
-- **MaxDebugConfiguration**: changes 3ds max version and platform, so all necessary files are copied into plugin directory, this will enable post-build event.
-
-## Post-build event
-Change 3ds max installation path (Default is C:\Program Files\Autodesk\). Do not change anything else unless you know what you're doing!
+- **MaxDebugConfiguration**: changes 3ds max version and platform, so all necessary files are copied into plugin directory, this will enable post-build event. You must have set ***Working Directory*** under ***Debugging*** in ***Project Properties*** to location, where 3ds max is installed (where 3dsmax.exe is).
 
+## Installation
 ### [Latest Release](https://github.com/PredatorCZ/HavokMax/releases/)
+Move corresponding .dlu located in correct version folder into ***%3ds max installation directory%/plugins***. \
+Versions must match!\
+Additionally plugin will require **Visual C++ Redistributable for Visual Studio 2015** to be installed in order to work.
 
 ## License
 This plugin is available under GPL v3 license. (See LICENSE.md)
diff --git a/src/DllEntry.cpp b/src/DllEntry.cpp
index 67f129f..40cc804 100644
--- a/src/DllEntry.cpp
+++ b/src/DllEntry.cpp
@@ -88,6 +88,9 @@ __declspec( dllexport ) ULONG LibVersion()
 
 void PrintLog(TCHAR* msg)
 {
+	if (!IsWindowVisible(the_listener_window) || IsIconic(the_listener_window))
+		show_listener();
+
 	mprintf(msg);
 	mflush();
 }
diff --git a/src/HavokMax.h b/src/HavokMax.h
index f356b6e..51e229a 100644
--- a/src/HavokMax.h
+++ b/src/HavokMax.h
@@ -54,7 +54,7 @@ class HavokMax
 	HWND comboHandle;
 	HWND hWnd;
 	TSTRING cfgpath;
-	t_Flags<char> sanityCheck;
+	esFlags<char> sanityCheck;
 	const TCHAR *CFGFile;
 	NewIDConfigValue(IDC_EDIT_SCALE);
 	NewIDConfigIndex(IDC_CB_TOOLSET);