/pause <name> always switches to watching name

Old behaviour switched you out of pause if you were paused already Thanks to fokkonaut for suggestion
ddnet · Dec 23, 2017 · 627291c · 627291c · worstwish · Dec 28, 2017
1 parent 08d7fc1
commit 627291c
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp
@@ -286,10 +286,19 @@ void CGameContext::ConToggleSpec(IConsole::IResult *pResult, void *pUserData)
 	int PauseState = pPlayer->IsPaused();
 	if(PauseState <= 0)
 	{
-		if(-PauseState != CPlayer::PAUSE_SPEC)
+		if(pResult->NumArguments() > 0)
+		{
 			pPlayer->Pause(CPlayer::PAUSE_SPEC, false);
+			pPlayer->SpectatePlayerName(pResult->GetString(0));
+		}
 		else if(-PauseState == CPlayer::PAUSE_SPEC)
+		{
 			pPlayer->Pause(CPlayer::PAUSE_NONE, false);
+		}
+		else if(-PauseState != CPlayer::PAUSE_SPEC)
+		{
+			pPlayer->Pause(CPlayer::PAUSE_SPEC, false);
+		}
 	}
 	else
 	{
@@ -298,9 +307,6 @@ void CGameContext::ConToggleSpec(IConsole::IResult *pResult, void *pUserData)
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "spec", aBuf);
 		return;
 	}
-
-	if(pResult->NumArguments() > 0)
-		pPlayer->SpectatePlayerName(pResult->GetString(0));
 }
 
 void CGameContext::ConTogglePause(IConsole::IResult *pResult, void *pUserData)
@@ -317,10 +323,19 @@ void CGameContext::ConTogglePause(IConsole::IResult *pResult, void *pUserData)
 	int PauseState = pPlayer->IsPaused();
 	if(PauseState <= 0)
 	{
-		if(-PauseState != CPlayer::PAUSE_PAUSED)
+		if(pResult->NumArguments() > 0)
+		{
 			pPlayer->Pause(CPlayer::PAUSE_PAUSED, false);
+			pPlayer->SpectatePlayerName(pResult->GetString(0));
+		}
 		else if(-PauseState == CPlayer::PAUSE_PAUSED)
+		{
 			pPlayer->Pause(CPlayer::PAUSE_NONE, false);
+		}
+		else if(-PauseState != CPlayer::PAUSE_PAUSED)
+		{
+			pPlayer->Pause(CPlayer::PAUSE_PAUSED, false);
+		}
 	}
 	else
 	{
@@ -329,9 +344,6 @@ void CGameContext::ConTogglePause(IConsole::IResult *pResult, void *pUserData)
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "spec", aBuf);
 		return;
 	}
-
-	if(pResult->NumArguments() > 0)
-		pPlayer->SpectatePlayerName(pResult->GetString(0));
 }
 
 void CGameContext::ConTeamTop5(IConsole::IResult *pResult, void *pUserData)