Merge branch 'development' of https://github.com/cortex-command-community/Cortex-Command-Community-Project into development

Author: Causeless

Source/Activities/GameActivity.cpp

@@ -1069,7 +1069,7 @@ void GameActivity::UpdateEditing() {
 			DisableAIs(false);
 			InitAIs();
 			// Reset the mouse value and pathfinding so it'll know about the newly placed stuff
-			g_UInputMan.SetMouseValueMagnitude(0);
+			g_UInputMan.SetMouseValueMagnitude(0, g_UInputMan.MouseUsedByPlayer());
 			g_SceneMan.GetScene()->ResetPathFinding();
 			// Start the in-game track
 			// g_AudioMan.ClearMusicQueue();
@@ -1249,7 +1249,7 @@ void GameActivity::Update() {
 			if (m_PlayerController[player].IsState(PRESS_SECONDARY)) {
 				// Reset the mouse so the actor doesn't change aim because mouse has been moved
 				if (m_PlayerController[player].IsMouseControlled()) {
-					g_UInputMan.SetMouseValueMagnitude(0);
+					g_UInputMan.SetMouseValueMagnitude(0, player);
 				}
 
 				m_ViewState[player] = ViewState::Normal;
@@ -1268,7 +1268,7 @@ void GameActivity::Update() {
 			else if (m_PlayerController[player].IsState(ACTOR_NEXT) || m_PlayerController[player].IsState(ACTOR_PREV) || m_PlayerController[player].IsState(PRESS_FACEBUTTON) || m_PlayerController[player].IsState(PRESS_PRIMARY)) {
 				// Reset the mouse so the actor doesn't change aim because mouse has been moved
 				if (m_PlayerController[player].IsMouseControlled()) {
-					g_UInputMan.SetMouseValueMagnitude(0);
+					g_UInputMan.SetMouseValueMagnitude(0, player);
 				}
 
 				if (pMarkedActor) {

Source/Entities/Actor.cpp

@@ -1364,8 +1364,8 @@ void Actor::DrawHUD(BITMAP* pTargetBitmap, const Vector& targetPos, int whichScr
 	}
 
 	int actorScreen = g_ActivityMan.GetActivity() ? g_ActivityMan.GetActivity()->ScreenOfPlayer(m_Controller.GetPlayer()) : -1;
-	bool screenTeamIsSameAsActorTeam = g_ActivityMan.GetActivity() ? g_ActivityMan.GetActivity()->GetTeamOfPlayer(whichScreen) == m_Team : true;
-	if (m_PieMenu->IsVisible() && screenTeamIsSameAsActorTeam && (!m_PieMenu->IsInNormalAnimationMode() || (m_Controller.IsPlayerControlled() && actorScreen == whichScreen))) {
+	bool screenTeamIsSameAsActorTeam = g_ActivityMan.GetActivity() ? g_ActivityMan.GetActivity()->GetTeamOfPlayer(g_ActivityMan.GetActivity()->PlayerOfScreen(whichScreen)) == m_Team : true;
+	if (m_PieMenu->IsVisible() && screenTeamIsSameAsActorTeam && (!m_PieMenu->IsInNormalAnimationMode() || (actorScreen == whichScreen))) {
 		m_PieMenu->Draw(pTargetBitmap, targetPos);
 	}
 

Source/Managers/ActivityMan.cpp

@@ -314,7 +314,7 @@ int ActivityMan::StartActivity(Activity* activity) {
 	g_FrameMan.ClearScreenText();
 
 	// Reset the mouse input to the center
-	g_UInputMan.SetMouseValueMagnitude(0.05F);
+	g_UInputMan.SetMouseValueMagnitude(0, g_UInputMan.MouseUsedByPlayer());
 
 	g_AudioMan.PauseIngameSounds(false);
 

Source/Managers/UInputMan.cpp

@@ -324,15 +324,17 @@ Vector UInputMan::GetMouseMovement(int whichPlayer) const {
 void UInputMan::SetMouseValueMagnitude(float magCap, int whichPlayer) {
 	if (IsInMultiplayerMode() && whichPlayer >= Players::PlayerOne && whichPlayer < Players::MaxPlayerCount) {
 		m_NetworkAnalogMoveData[whichPlayer].CapMagnitude(m_MouseTrapRadius * magCap);
+	} else if (whichPlayer != Players::NoPlayer && m_ControlScheme.at(whichPlayer).GetDevice() == InputDevice::DEVICE_MOUSE_KEYB) {
+		m_AnalogMouseData.SetMagnitude(m_MouseTrapRadius * magCap);
 	}
-	m_AnalogMouseData.SetMagnitude(m_MouseTrapRadius * magCap);
 }
 
 void UInputMan::SetMouseValueAngle(float angle, int whichPlayer) {
 	if (IsInMultiplayerMode() && whichPlayer >= Players::PlayerOne && whichPlayer < Players::MaxPlayerCount) {
 		m_NetworkAnalogMoveData[whichPlayer].SetAbsRadAngle(angle);
+	} else if (whichPlayer != Players::NoPlayer && m_ControlScheme.at(whichPlayer).GetDevice() == InputDevice::DEVICE_MOUSE_KEYB) {
+		m_AnalogMouseData.SetAbsRadAngle(angle);
 	}
-	m_AnalogMouseData.SetAbsRadAngle(angle);
 }
 
 void UInputMan::SetMousePos(const Vector& newPos, int whichPlayer) const {

Source/System/Controller.cpp

@@ -435,7 +435,7 @@ void Controller::UpdatePlayerAnalogInput() {
 	// Disable sharp aim while moving - this also helps with keyboard vs mouse fighting when moving and aiming in opposite directions
 	if (m_ControlStates[ControlState::BODY_JUMP] && !pieMenuActive) {
 		if (IsMouseControlled()) {
-			g_UInputMan.SetMouseValueMagnitude(0.3F);
+			g_UInputMan.SetMouseValueMagnitude(0.3F, m_Player);
 		}
 		m_ControlStates[ControlState::AIM_SHARP] = false;
 	}