Merge pull request #1530 from ripieces/master

fixes ValveSoftware/halflife#1529

projects/vs2010/readme.txt

@@ -6,9 +6,11 @@ projects.sln
   compiling the valve, dmc and ricochet DLL files.
   
 utils.sln
-  Solution file containing projects for the utilities. Special user interaction
+  Solution file containing projects for the utilities.
-  is required in order to compile a share of the projects, see "Installing GLUT
+  Special user interaction is required in order to compile a share of the
-  and GLAUX" bellow.
+  projects, see "Installing GLUT and GLAUX" bellow.
+  Special user interaction is also required for the smdlexp project, see
+  "smdlexp project" bellow.
   The serverctrl project is problematic, see "serverctrl project" bellow.
   Further project specific notes are also provided bellow.
   
@@ -129,4 +131,17 @@ smdlexp project
 
 Please note that this project requires the 3D Studio Max 4.2 SDK.
 You might need to adjust Include and Additional Library Directories according
-to your intallation.
+to your intallation in C++ and Linker settings.
+
+The MAX 4.2 SDK needs adjustment:
+Comment out the following line in max.h
+#include <ctl3d.h>
+So that it reads
+//#include <ctl3d.h
+.
+
+You also need the phyexp.h from Character Studio, which you should place in
+c:\3dsmax42\cstudio\sdk or adjust the Include Directories accordingly.
+
+Someone should port that project to a newer MAX SDK Version, but that is
+really beyond the current scope.

projects/vs2010/smdlexp.vcxproj

@@ -53,6 +53,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>c:\3dsmax42\maxsdk\include;c:\3dsmax42\cstudio\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -61,8 +62,8 @@
       <OutputFile>c:\3dsmax42\plugins\smdlexp.dle</OutputFile>
     </Link>
     <PostBuildEvent>
-      <Command>attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib
+      <Command>
-copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib</Command>
+      </Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Post-Build Event</Message>
@@ -76,6 +77,7 @@ copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib</Command>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>c:\3dsmax42\maxsdk\include;c:\3dsmax42\cstudio\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -84,8 +86,8 @@ copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib</Command>
       <OutputFile>c:\3dsmax42\plugins\smdlexp.dle</OutputFile>
     </Link>
     <PostBuildEvent>
-      <Command>attrib -r ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib
+      <Command>
-copy $(TargetPath) ..\..\utils\procinfo\lib\win32_vc6\procinfo.lib</Command>
+      </Command>
       <Message>Post-Build Event</Message>
     </PostBuildEvent>
     <Lib>

utils/smdlexp/smdlexp.cpp

@@ -821,7 +821,8 @@ Point3 DumpModelTEP::Pt3GetRVertexNormal(RVertex *prvertex, DWORD smGroupFace)
 		return prvertex->rn.getNormal();
 	else
 	{
-		for (int irn = 0; irn < cNormals; irn++)
+		int irn;
+		for (irn = 0; irn < cNormals; irn++)
 			if (prvertex->ern[irn].getSmGroup() & smGroupFace)
 				break;
 
@@ -908,7 +909,8 @@ void SetIndexOfINode(INode *pnode, int inode)
 {
 	TSTR strNodeName(pnode->GetName());
 	NAMEMAP *pnm;
-	for (int inm = 0; inm < g_inmMac; inm++)
+	int inm;
+	for (inm = 0; inm < g_inmMac; inm++)
 		if (FStrEq(g_rgnm[inm].szNodeName, (char*)strNodeName))
 			break;
 	if (inm < g_inmMac)