reload fix, maybe something else

lithe · May 4, 2013 · 4f7b1c9 · 4f7b1c9
1 parent 5dc420f
commit 4f7b1c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/game/shared/sdk/sdk_playeranimstate.cpp b/src/game/shared/sdk/sdk_playeranimstate.cpp
@@ -680,13 +680,14 @@ void CSDKPlayerAnimState::DoAnimationEvent( PlayerAnimEvent_t event, int nData )
 	case PLAYERANIMEVENT_RELOAD:
 		{
 			// Weapon reload.
+			/*//We only have standing reload-- it blends into other states
 			if ( m_pSDKPlayer->m_Shared.IsProne() || m_pSDKPlayer->m_Shared.IsDiveSliding() )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_PRONE );
 			else if ( m_pSDKPlayer->m_Shared.IsSliding() )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_SLIDE );
 			else if ( GetBasePlayer()->GetFlags() & FL_DUCKING )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_CROUCH );
-			else
+			else*/
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD );
 
 			iGestureActivity = ACT_VM_RELOAD; //Make view reload if it isn't already
@@ -695,13 +696,14 @@ void CSDKPlayerAnimState::DoAnimationEvent( PlayerAnimEvent_t event, int nData )
 	case PLAYERANIMEVENT_RELOAD_LOOP:
 		{
 			// Weapon reload.
+			/*//We only have standing reload-- it blends into other states
 			if ( m_pSDKPlayer->m_Shared.IsProne() || m_pSDKPlayer->m_Shared.IsDiveSliding() )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_LOOP_PRONE );
 			else if ( m_pSDKPlayer->m_Shared.IsSliding() )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_LOOP_SLIDE );
 			else if ( GetBasePlayer()->GetFlags() & FL_DUCKING )
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_LOOP_CROUCH );
-			else
+			else*/
 				RestartGesture( GESTURE_SLOT_ATTACK_AND_RELOAD, ACT_DAB_RELOAD_LOOP );
 
 			iGestureActivity = ACT_INVALID; //TODO: fix

diff --git a/src/game/shared/sdk/weapon_akimbobase.cpp b/src/game/shared/sdk/weapon_akimbobase.cpp
@@ -44,8 +44,8 @@ CAkimbobase::ActivityOverride (Activity baseAct, bool *pRequired)
 int
 CAkimbobase::GetTracerAttachment (void)
 {
-	if (!shootright) return 1;
-	return 2;
+	if (shootright) return 2;
+	return 1;
 }
 Activity 
 CAkimbobase::GetIdleActivity (void)