Merge pull request #289 from johnr14/master

Linux bug fix, still lots to do.

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "neo/libs/OpenVR"]
-	path = neo/libs/OpenVR
+[submodule "neo/libs/openvr"]
+	path = neo/libs/openvr
 	url = https://github.com/ValveSoftware/openvr.git

neo/d3xp/IK.cpp

@@ -1412,9 +1412,9 @@ void idIK_Reach::Evaluate()
 				gameRenderWorld->DebugArrow( colorMagenta, handOrigin, handOrigin + handDir * 8.0f, 1 );
 			else
 				gameRenderWorld->DebugArrow( colorRed, handOrigin, handOrigin + handDir * 8.0f, 1 );
-			gameRenderWorld->DrawTextA( va( "%.2f, %.2f, %.2f", localHandDir.x, localHandDir.y, localHandDir.z ), handOrigin + handDir * 11.0f, 0.06f, colorWhite, modelAxis );
-			gameRenderWorld->DrawTextA( va( "%.2f, %.2f, %.2f", handPos[i].x, handPos[i].y, handPos[i].z ), handOrigin + handDir * 9.0f, 0.04f, colorWhite, modelAxis );
-			gameRenderWorld->DrawTextA( va( "%.2f, %.2f, %.2f", shoulderPos[i].x, shoulderPos[i].y, shoulderPos[i].z ), shoulderOrigin + handDir * 11.0f, 0.04f, colorWhite, modelAxis );
+			gameRenderWorld->DrawText( va( "%.2f, %.2f, %.2f", localHandDir.x, localHandDir.y, localHandDir.z ), handOrigin + handDir * 11.0f, 0.06f, colorWhite, modelAxis );
+			gameRenderWorld->DrawText( va( "%.2f, %.2f, %.2f", handPos[i].x, handPos[i].y, handPos[i].z ), handOrigin + handDir * 9.0f, 0.04f, colorWhite, modelAxis );
+			gameRenderWorld->DrawText( va( "%.2f, %.2f, %.2f", shoulderPos[i].x, shoulderPos[i].y, shoulderPos[i].z ), shoulderOrigin + handDir * 11.0f, 0.04f, colorWhite, modelAxis );
 			gameRenderWorld->DebugLine( colorCyan, shoulderOrigin, elbowOrigin );
 			gameRenderWorld->DebugLine( colorRed, elbowOrigin, handOrigin );
 			gameRenderWorld->DebugArrow( colorYellow, elbowOrigin, elbowOrigin + elbowDir * 8.0f, 1 );

neo/d3xp/Player.cpp

@@ -2734,7 +2734,7 @@ void idPlayerHand::debugPrint()
 	else
 	{
 		common->Printf( "  currentWeapon = %s = %d%s\n", GetCurrentWeaponString().c_str(), currentWeapon, s.c_str() );
-		common->Printf( "  idealWeapon = %d, weaponSwitchTime (unused?) = %dms\n", idealWeapon, weaponSwitchTime - gameLocal.time );
+		common->Printf( "  idealWeapon = %d, weaponSwitchTime (unused?) = %dms\n", idealWeapon.Get(), weaponSwitchTime - gameLocal.time );
 	}
 	common->Printf( "  previousWeapon = %d\n", previousWeapon );
 	idWeapon* weap = weapon.GetEntity();

neo/vr/Vr.h

@@ -41,7 +41,7 @@ If you have questions concerning this license or the applicable additional terms
 #ifdef USE_OVR
 #include "..\LibOVR\Include\OVR_CAPI_Audio.h"
 #endif
-#include "../libs/OpenVR/headers/openvr.h"
+#include "../libs/openvr/headers/openvr.h"
 
 
 #ifndef __VR_H__
@@ -643,6 +643,3 @@ typedef enum
 } vr_weaponcycle_t;
 
 #endif
-
-
-