tweak(metaevent): Change COMMANDUSABLE_OBSERVER to no longer apply in Shell Map (#2002)

Keys P and O no longer pause the Shell Map. But Shift+P and Shift+O still do

Author: xezon

Core/GameEngine/Include/Common/GameUtility.h

@@ -28,7 +28,6 @@ typedef Int PlayerIndex;
 namespace rts
 {
 
-bool localPlayerIsObserving();
 bool localPlayerHasRadar();
 Player* getObservedOrLocalPlayer(); ///< Get the current observed or local player. Is never null.
 Player* getObservedOrLocalPlayer_Safe(); ///< Get the current observed or local player. Is never null, except when the application does not have players.

Core/GameEngine/Source/Common/GameUtility.cpp

@@ -49,17 +49,6 @@ static void changePlayerCommon(Player* player)
 
 } // namespace detail
 
-bool localPlayerIsObserving()
-{
-	if (TheGameLogic->isInReplayGame() || TheGameLogic->isInShellGame())
-		return true;
-
-	if (ThePlayerList->getLocalPlayer()->isPlayerObserver())
-		return true;
-
-	return false;
-}
-
 bool localPlayerHasRadar()
 {
 	// Using "local" instead of "observed or local" player because as an observer we prefer

Generals/Code/GameEngine/Include/Common/Player.h

@@ -590,9 +590,9 @@ class Player : public Snapshot
 
 	Bool isPlayableSide( void ) const;
 
-	Bool isPlayerObserver( void ) const; // Favor !isActive() - this is used for Observer GUI mostly, not in-game stuff
-	Bool isPlayerDead(void) const; // Favor !isActive() - this is used so OCLs don't give us stuff after death.
-	Bool isPlayerActive(void) const;
+	Bool isPlayerObserver( void ) const; // Favor !isPlayerActive() - this is used for Observer GUI mostly, not in-game stuff
+	Bool isPlayerDead(void) const; // Favor !isPlayerActive() - this is used so OCLs don't give us stuff after death.
+	Bool isPlayerActive(void) const; // Player is alive and not observer. !isPlayerActive() is synonymous with observing.
 
 	Bool didPlayerPreorder( void ) const { return m_isPreorder; }
 

Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp

@@ -380,14 +380,16 @@ static Bool isMessageUsable(CommandUsableInType usableIn)
 	const Bool usableInShell = (usableIn & COMMANDUSABLE_SHELL);
 	const Bool usableInGame = (usableIn & COMMANDUSABLE_GAME);
 	const Bool usableAsObserver = (usableIn & COMMANDUSABLE_OBSERVER);
+	const Bool isShellActive = TheShell && TheShell->isShellActive();
+	const Bool isObserving = !ThePlayerList->getLocalPlayer()->isPlayerActive();
 
-	if (usableInShell && TheShell && TheShell->isShellActive())
+	if (usableInShell && isShellActive)
 		return true;
 
-	if (usableInGame && (!TheShell || !TheShell->isShellActive()))
+	if (usableInGame && !isShellActive)
 		return true;
 
-	if (usableAsObserver && rts::localPlayerIsObserving())
+	if (usableAsObserver && isObserving)
 		return true;
 
 	return false;

GeneralsMD/Code/GameEngine/Include/Common/Player.h

@@ -617,9 +617,9 @@ class Player : public Snapshot
 
 	Bool isPlayableSide( void ) const;
 
-	Bool isPlayerObserver( void ) const; // Favor !isActive() - this is used for Observer GUI mostly, not in-game stuff
-	Bool isPlayerDead(void) const; // Favor !isActive() - this is used so OCLs don't give us stuff after death.
-	Bool isPlayerActive(void) const;
+	Bool isPlayerObserver( void ) const; // Favor !isPlayerActive() - this is used for Observer GUI mostly, not in-game stuff
+	Bool isPlayerDead(void) const; // Favor !isPlayerActive() - this is used so OCLs don't give us stuff after death.
+	Bool isPlayerActive(void) const; // Player is alive and not observer. !isPlayerActive() is synonymous with observing.
 
 	Bool didPlayerPreorder( void ) const { return m_isPreorder; }
 

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp

@@ -418,14 +418,16 @@ static Bool isMessageUsable(CommandUsableInType usableIn)
 	const Bool usableInShell = (usableIn & COMMANDUSABLE_SHELL);
 	const Bool usableInGame = (usableIn & COMMANDUSABLE_GAME);
 	const Bool usableAsObserver = (usableIn & COMMANDUSABLE_OBSERVER);
+	const Bool isShellActive = TheShell && TheShell->isShellActive();
+	const Bool isObserving = !ThePlayerList->getLocalPlayer()->isPlayerActive();
 
-	if (usableInShell && TheShell && TheShell->isShellActive())
+	if (usableInShell && isShellActive)
 		return true;
 
-	if (usableInGame && (!TheShell || !TheShell->isShellActive()))
+	if (usableInGame && !isShellActive)
 		return true;
 
-	if (usableAsObserver && rts::localPlayerIsObserving())
+	if (usableAsObserver && isObserving)
 		return true;
 
 	return false;