Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 893350b

Browse files
committed
Remove safety check (revert ebcce19)
Since this just fails silently without side effects with the current custom Vector copy-assignment operator the check can be removed This crashing when we eventually switch to using the default copy-assignment operator will serve as an immediate reminder to fix it
1 parent f7b8747 commit 893350b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Entities/Activity.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,9 @@ void Activity::Clear() {
286286

287287
// Intentionally doing all players, all need controllers
288288
for (short player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
289-
const short playerScreen = ScreenOfPlayer(player);
290289
m_ViewState[player] = ViewState::Normal;
291-
g_FrameMan.ClearScreenText(playerScreen);
292-
if (playerScreen >= 0) {
293-
g_SceneMan.SetScreenOcclusion(Vector(), playerScreen);
294-
}
290+
g_FrameMan.ClearScreenText(ScreenOfPlayer(player));
291+
g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
295292

296293
m_PlayerController[player].Destroy();
297294
m_PlayerController[player].Create(Controller::CIM_PLAYER, player);

0 commit comments

Comments
 (0)