From 146c88d016699958973e522c7f7f529a756708a7 Mon Sep 17 00:00:00 2001 From: parax0 Date: Fri, 26 Feb 2016 05:38:26 -0700 Subject: [PATCH] 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 --- src/Core/Resource/Script/IPropertyTemplate.h | 8 -------- src/Core/Scene/CScriptNode.cpp | 5 ++++- templates/dkcr/Script/ClingPathControl.xml | 4 ++++ templates/dkcr/Script/PathControl.xml | 2 +- templates/dkcr/Script/SplinePath.xml | 2 +- templates/dkcr/Structs/ControlCommands.xml | 2 ++ templates/dkcr/Structs/Convergence.xml | 5 ++++- templates/mp1/Script/Trigger.xml | 19 +++++++++++++------ 8 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/Core/Resource/Script/IPropertyTemplate.h b/src/Core/Resource/Script/IPropertyTemplate.h index 8eb947c0..1b2bd58b 100644 --- a/src/Core/Resource/Script/IPropertyTemplate.h +++ b/src/Core/Resource/Script/IPropertyTemplate.h @@ -668,14 +668,6 @@ public: return false; } - { - - for (u32 iProp = 0; iProp < mSubProperties.size(); iProp++) - { - IPropertyTemplate *pProp = mSubProperties[iProp]; - } - } - inline TString SourceFile() const { return mSourceFile; } inline bool IsSingleProperty() const { return mIsSingleProperty; } inline u32 Count() const { return mSubProperties.size(); } diff --git a/src/Core/Scene/CScriptNode.cpp b/src/Core/Scene/CScriptNode.cpp index c7901aa1..ddcb35a9 100644 --- a/src/Core/Scene/CScriptNode.cpp +++ b/src/Core/Scene/CScriptNode.cpp @@ -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; } diff --git a/templates/dkcr/Script/ClingPathControl.xml b/templates/dkcr/Script/ClingPathControl.xml index 06a6d7e0..a455ace9 100644 --- a/templates/dkcr/Script/ClingPathControl.xml +++ b/templates/dkcr/Script/ClingPathControl.xml @@ -33,6 +33,10 @@ + + 1.0, 1.0, 1.0, 1.0 + This property isn't read by the game and has no ingame effect. + diff --git a/templates/dkcr/Script/PathControl.xml b/templates/dkcr/Script/PathControl.xml index 97438366..6d8f2c69 100644 --- a/templates/dkcr/Script/PathControl.xml +++ b/templates/dkcr/Script/PathControl.xml @@ -10,7 +10,7 @@ 1.0, 1.0, 1.0, 1.0 - This property isn't read by the game and has no ingame effect. + This property isn't read by the game and has no ingame effect. diff --git a/templates/dkcr/Script/SplinePath.xml b/templates/dkcr/Script/SplinePath.xml index bcdff145..38909c25 100644 --- a/templates/dkcr/Script/SplinePath.xml +++ b/templates/dkcr/Script/SplinePath.xml @@ -9,7 +9,7 @@ 1.0, 1.0, 1.0, 1.0 - This property is purely for editor visualization. It isn't read by the game and has no ingame effect. + This property is purely for editor visualization. It isn't read by the game and has no ingame effect. diff --git a/templates/dkcr/Structs/ControlCommands.xml b/templates/dkcr/Structs/ControlCommands.xml index 35827d25..1999b185 100644 --- a/templates/dkcr/Structs/ControlCommands.xml +++ b/templates/dkcr/Structs/ControlCommands.xml @@ -40,6 +40,8 @@ + + diff --git a/templates/dkcr/Structs/Convergence.xml b/templates/dkcr/Structs/Convergence.xml index a32f25f9..9b2b1449 100644 --- a/templates/dkcr/Structs/Convergence.xml +++ b/templates/dkcr/Structs/Convergence.xml @@ -25,13 +25,16 @@ - This struct isn't read by the game, so it has no ingame effect. + This struct isn't read by the game, so it has no ingame effect. false always + + 0.0 + diff --git a/templates/mp1/Script/Trigger.xml b/templates/mp1/Script/Trigger.xml index f7038090..cea6790d 100644 --- a/templates/mp1/Script/Trigger.xml +++ b/templates/mp1/Script/Trigger.xml @@ -13,12 +13,19 @@ - - - - - - + + + + + + + + + + + + +