bugfix: Update visibility conditions for client-side effects #1964
Conversation
Stubbjax
added
Bug
| if (TheControlBar->isObserverControlBarOn()) | ||
| { | ||
| const Player* observedPlayer = TheControlBar->getObserverLookAtPlayer(); | ||
| if (!observedPlayer || !observedPlayer->isPlayerActive()) |
There was a problem hiding this comment.
Is this test really necessary? If this was missing, what would be broken?
There was a problem hiding this comment.
The isPlayerActive check? This ensures that the respective effects are still shown if the observer is viewing a dead player, in which case everything is visible (shroud, stealth, etc.) as if the player is not viewing anyone.
There was a problem hiding this comment.
I took another look at rts::localPlayerIsObserving() and removed it again with #2002.
| if (obj->isKindOf(KINDOF_DISGUISER)) | ||
| return true; | ||
|
|
||
| if (obj->testStatus(OBJECT_STATUS_STEALTHED) && !obj->testStatus(OBJECT_STATUS_DETECTED)) |
There was a problem hiding this comment.
Maybe combine this as
if (!obj->isKindOf(KINDOF_DISGUISER)
&& obj->testStatus(OBJECT_STATUS_STEALTHED)
&& !obj->testStatus(OBJECT_STATUS_DETECTED))because I suspect these guys belong together?
| if (rts::localPlayerIsObserving()) | ||
| { | ||
| const Player* observedPlayer = TheControlBar->getObserverLookAtPlayer(); | ||
| if (!observedPlayer || !observedPlayer->isPlayerActive()) |
There was a problem hiding this comment.
Can we perhaps remove this whole thing and instead do:
if (...)
const Player* player = rts::getObservedOrLocalPlayer();
const Relationship relationship = player->getRelationship(getTeam());
if (player->isActivePlayer() && relationship != ALLIES)
return false;If I am not mistaken this would guarantee that it does the relationship check only with alive player and therefore simplify the logic.
And maybe the isLocallyViewed() test will also be implicitly redundant then.
| void setCustomIndicatorColor(Color c); | ||
| void removeCustomIndicatorColor(); | ||
|
|
||
| Bool isLogicallyVisible() const; ///< Returns whether the object is logically visible to the player. |
There was a problem hiding this comment.
I suggest also clarify that this does not consider shroud, which is an important factor.
2 participants
Closes #1919
This change adjusts income text, veterancy animations and weapon effect conditions so that they play irrespective of an object's drawable / rendering state or being within the view frustum.
Bomb Truck effects now consistently play during their disguise transition states for other players as an added bonus. See #1919 for more information.