Two handed weapon

.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

README.txt

@@ -245,12 +245,20 @@ ___________________________________________________
 4) NEW FEATURES
 __________________________________________
 
-New in 0.23:
+New in 0.23 (unreleased):
 	Spanish voice commands (to use, replace dict/voice.dict with dict/voiceSpanish.dict)
 
 New in 0.21-Alpha-WMR (WMR Joystick support) (unofficial):
 	Windows Mixed Reality Joystick support
 
+New in 0.21b (unofficial): (2020 Feb 13)
+	Try to release in 2020 current (awesome but stalled) work combined by Koz and Carl, 
+	Almost all is functionnal but dual weilding which doesn't work well with my set (ValveIndex)
+	Released as a Patch : install official v0.020, then unzip patch into the Doom Folder, you should accept all replacements
+	Contains almost all 0.21a updates (but dual weilding)
+	Merge save/loading fix by Carl
+	Merge compiling fix merged on Carl repo
+
 New in 0.21a (unreleased):
 	Doom VFR style teleport and jet-strafe
 	Added headshot damage multiplier vr_headshotMultiplier (defaults to 2.5x)

doomclassic/.clang-format

@@ -0,0 +1,111 @@
+---
+# Doom 1 coding style
+
+Language:        Cpp
+Standard:        Auto
+DisableFormat:   false
+
+IndentWidth:     4
+TabWidth:        4
+UseTab:          ForContinuationAndIndentation
+IndentCaseLabels: false
+AccessModifierOffset: -4
+IndentWrappedFunctionNames: false
+NamespaceIndentation: All
+ContinuationIndentWidth: 4
+
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceInEmptyParentheses: false
+SpacesInContainerLiterals: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+#SpaceBeforeCpp11BracedList: false
+
+SpaceBeforeAssignmentOperators: true
+#SpaceAfterLogicalNot: false
+SpacesBeforeTrailingComments: 1
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+  IndentBraces:    false       # always
+  AfterClass:      true        # always
+  AfterEnum:       true        # 6 out of 61 are wrong
+  AfterUnion:      false       # 1 out of 6 is wrong
+  AfterStruct:     true        # most of the time
+  AfterFunction:   true        # most of the time
+  AfterNamespace:  false       # 2 out of 6 are wrong
+  BeforeElse:      false       # about 50/50 so use the style I prefer
+  AfterControlStatement: false # a mixture so use the style I prefer
+  BeforeCatch:     true        # never used
+  AfterObjCDeclaration: false  # never used
+
+ColumnLimit:     100
+
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignTrailingComments: false
+
+#SpaceBeforeInheritanceColon: true
+#SpaceBeforeCtorInitializerColon: true
+#AllowAllConstructorInitializersOnNextLine: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowAllArgumentsOnNextLine: false
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+
+
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+#AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeTernaryOperators: false
+
+DerivePointerAlignment: true
+PointerAlignment: Left
+
+SortIncludes: false
+SortUsingDeclarations: false
+ReflowComments: false
+MaxEmptyLinesToKeep: 3
+KeepEmptyLinesAtTheStartOfBlocks: true
+
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^\<[^Q][^/.>]*\>'
+    Priority:        -2
+  - Regex:           '^\<'
+    Priority:        -1
+  - Regex:           '^\"'
+    Priority:        0
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 150
+
+# inconsistent
+#SpacesInSquareBrackets: false
+#SpacesInAngles:  false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlinesLeft: false
+#AlignOperands: false
+#BreakBeforeBinaryOperators: None
+...

neo/.clang-format

@@ -0,0 +1,113 @@
+---
+# Doom 3 coding style
+
+Language:        Cpp
+Standard:        Auto
+DisableFormat:   false
+
+IndentWidth:     4
+TabWidth:        4
+UseTab:          Always
+IndentCaseLabels: true
+AccessModifierOffset: -4
+IndentWrappedFunctionNames: false
+NamespaceIndentation: None
+ContinuationIndentWidth: 4
+
+SpaceBeforeParens: false
+SpacesInParentheses: true
+SpacesInCStyleCastParentheses: true
+SpaceInEmptyParentheses: false
+SpacesInContainerLiterals: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+#SpaceBeforeCpp11BracedList: false
+
+SpaceBeforeAssignmentOperators: true
+#SpaceAfterLogicalNot: false
+#SpacesBeforeTrailingComments: 1
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+
+ColumnLimit:     160
+
+AlignAfterOpenBracket: Align
+AlignTrailingComments: true
+
+#SpaceBeforeInheritanceColon: true
+#SpaceBeforeCtorInitializerColon: true
+#AllowAllConstructorInitializersOnNextLine: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowAllArgumentsOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+
+
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+#AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeTernaryOperators: false
+
+DerivePointerAlignment: false
+PointerAlignment: Left
+
+SortIncludes: false
+SortUsingDeclarations: false
+ReflowComments: false
+MaxEmptyLinesToKeep: 3
+KeepEmptyLinesAtTheStartOfBlocks: true
+
+BreakConstructorInitializersBeforeComma: false
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^\<[^Q][^/.>]*\>'
+    Priority:        -2
+  - Regex:           '^\<'
+    Priority:        -1
+  - Regex:           '^\"'
+    Priority:        0
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 150
+
+# inconsistent
+SpacesInSquareBrackets: true
+#SpacesInAngles:  false
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlinesLeft: false
+#AlignOperands: false
+#BreakBeforeBinaryOperators: None
+...

neo/CMakeLists.txt

@@ -110,6 +110,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
 
 elseif(MSVC)
 
+	# the warnings are used for every profile anyway, so put them in a variable
+	# 4267 is for warning about converting size_t to smaller types (eg. int)
+	# 4467 is for VS2017 spamming: warning C4467: usage of ATL attributes is deprecated 
+	set(my_warn_flags "/wd4267 /wd4467")
+
 	# Multiprocessor support for compiling
 	# /MP
 
@@ -152,15 +157,15 @@ elseif(MSVC)
 		# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP ${WINRT_OPTIONS}")
 		# set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Oi /Oy ${WINRT_OPTIONS}")
 	# else()
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /D _DEBUG /MP /MTd")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MP /Oi /Oy /MT /wd4267")
-		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MP /Oi /MTd /wd4267")
-		set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT /wd4267")
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /D _DEBUG /MP /MTd ${my_warn_flags}")
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MP /Oi /Oy /MT ${my_warn_flags}")
+		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MP /Oi /MTd ${my_warn_flags}")
+		set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT ${my_warn_flags}")
 
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /MTd")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /Oi /Oy /MT /wd4267")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP /MTd /wd4267")
-		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT /wd4267")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /MTd ${my_warn_flags}")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /Oi /Oy /MT ${my_warn_flags}")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP /MTd ${my_warn_flags}")
+		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT ${my_warn_flags}")
 
 		# RB: without /SAFESEH:NO we can't link against ffmpeg libs and VS2013 or we have to build our own
 		# libs for newer compilers
@@ -1252,13 +1257,13 @@ include_directories(
 			.
 			idlib
 			#libs/curl/include
-			#libs/openal/include
+			#libs/openal-soft/include
 			#libs/freetype/include
             )
 
 #link_directories(
 #			${CMAKE_CURRENT_SOURCE_DIR}/libs/curl/lib
-#			${CMAKE_CURRENT_SOURCE_DIR}/libs/openal/lib)
+#			${CMAKE_CURRENT_SOURCE_DIR}/libs/openal-soft/lib)
 
 if(MSVC)
 

neo/cmake-vs2013-32bit-openal.bat

@@ -2,5 +2,5 @@ cd ..
 del /s /q build
 mkdir build
 cd build
-cmake -G "Visual Studio 12" -DCMAKE_INSTALL_PREFIX=../bin/win8-32 -DOPENAL=ON ../neo
+cmake -G "Visual Studio 12 2013" -DCMAKE_INSTALL_PREFIX=../bin/win8-32 -DOPENAL=ON ../neo
 pause

neo/cmake-vs2013-32bit.bat

@@ -2,5 +2,5 @@ cd ..
 del /s /q build
 mkdir build
 cd build
-cmake -G "Visual Studio 12" -DCMAKE_INSTALL_PREFIX=../bin/win8-32 ../neo
+cmake -G "Visual Studio 12 2013" -DCMAKE_INSTALL_PREFIX=../bin/win8-32 ../neo
 pause

neo/cmake-vs2013-64bit.bat

@@ -2,5 +2,5 @@ cd ..
 del /s /q build
 mkdir build
 cd build
-cmake -G "Visual Studio 12 Win64" -DCMAKE_INSTALL_PREFIX=../bin/win8-64 ../neo
+cmake -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=../bin/win8-64 ../neo
 pause

neo/cmake-vs2017-64bit - debug.bat

@@ -0,0 +1,6 @@
+cd ..
+del /s /q build
+mkdir build
+cd build
+cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_VERSION="10.0.10240.0" -DCMAKE_INSTALL_PREFIX=../bin/win8-64 -DCMAKE_BUILD_TYPE=Debug ../neo
+pause

neo/d3xp/AFEntity.cpp

@@ -3770,7 +3770,7 @@ void idHarvestable::Think()
 	{
 		idPlayer* thePlayer = player.GetEntity();
 
-		thePlayer->Give( spawnArgs.GetString( "give_item" ), spawnArgs.GetString( "give_value" ), ITEM_GIVE_FEEDBACK | ITEM_GIVE_UPDATE_STATE, thePlayer->GetHarvestWeapon("")->GetHand() );
+		thePlayer->Give( spawnArgs.GetString( "give_item" ), spawnArgs.GetString( "give_value" ), ITEM_GIVE_FEEDBACK | ITEM_GIVE_UPDATE_STATE );
 		thePlayer->harvest_lock = false;
 		given = true;
 	}
@@ -3946,13 +3946,11 @@ bool idHarvestable::GetFxOrientationAxis( idMat3& mat )
 		jointHandle_t	joint;
 		idVec3	joint_origin;
 		idMat3	joint_axis;
-
-		// Carl: use correct weapon when dual wielding
-		idWeapon *weapon = thePlayer->GetHarvestWeapon( spawnArgs.GetString( "required_weapons" ) );
-		joint = weapon->GetAnimator()->GetJointHandle( spawnArgs.GetString( "fx_weapon_joint" ) );
+
+		joint = thePlayer->weapon.GetEntity()->GetAnimator()->GetJointHandle( spawnArgs.GetString( "fx_weapon_joint" ) );
 		if( joint != INVALID_JOINT )
 		{
-			weapon->GetJointWorldTransform( joint, gameLocal.slow.time, joint_origin, joint_axis );
+			thePlayer->weapon.GetEntity()->GetJointWorldTransform( joint, gameLocal.slow.time, joint_origin, joint_axis );
 		}
 		else
 		{
@@ -4060,7 +4058,7 @@ void idHarvestable::Event_Touch( idEntity* other, trace_t* trace )
 
 		if( requiredWeapons.Length() > 0 )
 		{
-			idStr playerWeap = thePlayer->GetCurrentHarvestWeapon( requiredWeapons );
+			idStr playerWeap = thePlayer->GetCurrentWeapon();
 			if( playerWeap.Length() == 0 || requiredWeapons.Find( playerWeap, false ) == -1 )
 			{
 				okToGive = false;
@@ -4077,8 +4075,7 @@ void idHarvestable::Event_Touch( idEntity* other, trace_t* trace )
 				//Lock the player from harvesting to prevent multiple harvests when only one is needed
 				thePlayer->harvest_lock = true;
 
-				// Carl: Dual wielding
-				idWeapon* weap = thePlayer->GetHarvestWeapon( requiredWeapons );
+				idWeapon* weap = ( idWeapon* )thePlayer->weapon.GetEntity();
 				if( weap )
 				{
 					//weap->PostEventMS(&EV_Weapon_State, 0, "Charge", 8);