Removed some lines that weren't deleted in an earlier commit for some reason, fixed some objects being selectable in game mode despite not being visible, fixed a few property templates

This commit is contained in:
parax0
2016-02-26 05:38:26 -07:00
parent e8f48ef66a
commit 146c88d016
8 changed files with 29 additions and 18 deletions

View File

@@ -282,7 +282,10 @@ void CScriptNode::RayAABoxIntersectTest(CRayCollisionTester& Tester, const SView
// If we're in game mode, then check whether we're visible before proceeding with the ray test.
if (ViewInfo.GameMode)
{
if ( (!mpInstance->IsActive() && Template()->Game() != eReturns) || !mpInstance->HasInGameModel())
if (mGameModeVisibility == eUntested)
TestGameModeVisibility();
if (mGameModeVisibility != eVisible)
return;
}