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:
parent
e8f48ef66a
commit
146c88d016
|
@ -668,14 +668,6 @@ public:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
for (u32 iProp = 0; iProp < mSubProperties.size(); iProp++)
|
|
||||||
{
|
|
||||||
IPropertyTemplate *pProp = mSubProperties[iProp];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline TString SourceFile() const { return mSourceFile; }
|
inline TString SourceFile() const { return mSourceFile; }
|
||||||
inline bool IsSingleProperty() const { return mIsSingleProperty; }
|
inline bool IsSingleProperty() const { return mIsSingleProperty; }
|
||||||
inline u32 Count() const { return mSubProperties.size(); }
|
inline u32 Count() const { return mSubProperties.size(); }
|
||||||
|
|
|
@ -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 we're in game mode, then check whether we're visible before proceeding with the ray test.
|
||||||
if (ViewInfo.GameMode)
|
if (ViewInfo.GameMode)
|
||||||
{
|
{
|
||||||
if ( (!mpInstance->IsActive() && Template()->Game() != eReturns) || !mpInstance->HasInGameModel())
|
if (mGameModeVisibility == eUntested)
|
||||||
|
TestGameModeVisibility();
|
||||||
|
|
||||||
|
if (mGameModeVisibility != eVisible)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
</enum>
|
</enum>
|
||||||
</properties>
|
</properties>
|
||||||
</struct>
|
</struct>
|
||||||
|
<property ID="0x00DD86E2" type="color">
|
||||||
|
<default>1.0, 1.0, 1.0, 1.0</default>
|
||||||
|
<description>This property isn't read by the game and has no ingame effect.</description>
|
||||||
|
</property>
|
||||||
</properties>
|
</properties>
|
||||||
<states/>
|
<states/>
|
||||||
<messages/>
|
<messages/>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<struct ID="0x20091B54" template="Structs/SplineType.xml"/>
|
<struct ID="0x20091B54" template="Structs/SplineType.xml"/>
|
||||||
<property ID="0x00DD86E2" type="color">
|
<property ID="0x00DD86E2" type="color">
|
||||||
<default>1.0, 1.0, 1.0, 1.0</default>
|
<default>1.0, 1.0, 1.0, 1.0</default>
|
||||||
<description>This property isn't read by the game and has no ingame effect.</description>
|
<description>This property isn't read by the game and has no ingame effect.</description>
|
||||||
</property>
|
</property>
|
||||||
</properties>
|
</properties>
|
||||||
<states/>
|
<states/>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<struct ID="0x20091B54" template="Structs/SplineType.xml"/>
|
<struct ID="0x20091B54" template="Structs/SplineType.xml"/>
|
||||||
<property ID="0x00DD86E2" type="color">
|
<property ID="0x00DD86E2" type="color">
|
||||||
<default>1.0, 1.0, 1.0, 1.0</default>
|
<default>1.0, 1.0, 1.0, 1.0</default>
|
||||||
<description>This property is purely for editor visualization. It isn't read by the game and has no ingame effect.</description>
|
<description>This property is purely for editor visualization. It isn't read by the game and has no ingame effect.</description>
|
||||||
</property>
|
</property>
|
||||||
</properties>
|
</properties>
|
||||||
<states/>
|
<states/>
|
||||||
|
|
|
@ -40,6 +40,8 @@
|
||||||
<enumerator ID="0x7FD04BC9" name="Unknown 34"/>
|
<enumerator ID="0x7FD04BC9" name="Unknown 34"/>
|
||||||
<enumerator ID="0x82B045FA" name="Unknown 35"/>
|
<enumerator ID="0x82B045FA" name="Unknown 35"/>
|
||||||
<enumerator ID="0xF4863F16" name="Unknown 36"/>
|
<enumerator ID="0xF4863F16" name="Unknown 36"/>
|
||||||
|
<enumerator ID="0x955321A2" name="Invalid 1"/>
|
||||||
|
<enumerator ID="0x5F3FCED8" name="Invalid 2"/>
|
||||||
</enumerators>
|
</enumerators>
|
||||||
</enum>
|
</enum>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -25,13 +25,16 @@
|
||||||
</properties>
|
</properties>
|
||||||
</struct>
|
</struct>
|
||||||
<struct ID="0x1FF47DDF" type="multi">
|
<struct ID="0x1FF47DDF" type="multi">
|
||||||
<description>This struct isn't read by the game, so it has no ingame effect.</description>
|
<description>This struct isn't read by the game, so it has no ingame effect.</description>
|
||||||
<properties>
|
<properties>
|
||||||
<property ID="0x18C7396A" type="bool">
|
<property ID="0x18C7396A" type="bool">
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
<should_cook>always</should_cook>
|
<should_cook>always</should_cook>
|
||||||
</property>
|
</property>
|
||||||
<property ID="0xBD0B7EDE" type="string"/>
|
<property ID="0xBD0B7EDE" type="string"/>
|
||||||
|
<property ID="0x6C84C588" type="float">
|
||||||
|
<default>0.0</default>
|
||||||
|
</property>
|
||||||
</properties>
|
</properties>
|
||||||
</struct>
|
</struct>
|
||||||
<struct ID="0x0CF33816" type="multi">
|
<struct ID="0x0CF33816" type="multi">
|
||||||
|
|
|
@ -13,12 +13,19 @@
|
||||||
<flag mask="0x00000002" name="Unknown 2"/>
|
<flag mask="0x00000002" name="Unknown 2"/>
|
||||||
<flag mask="0x00000004" name="Unknown 3"/>
|
<flag mask="0x00000004" name="Unknown 3"/>
|
||||||
<flag mask="0x00000008" name="Unknown 4"/>
|
<flag mask="0x00000008" name="Unknown 4"/>
|
||||||
<flag mask="0x00000800" name="Unknown 5"/>
|
<flag mask="0x00000010" name="Unknown 5"/>
|
||||||
<flag mask="0x00001000" name="Unknown 6"/>
|
<flag mask="0x00000020" name="Unknown 6"/>
|
||||||
<flag mask="0x00002000" name="Unknown 7"/>
|
<flag mask="0x00000040" name="Unknown 7"/>
|
||||||
<flag mask="0x00004000" name="Unknown 8"/>
|
<flag mask="0x00000080" name="Unknown 8"/>
|
||||||
<flag mask="0x00010000" name="Unknown 9"/>
|
<flag mask="0x00000100" name="Unknown 9"/>
|
||||||
<flag mask="0x00020000" name="Unknown 10"/>
|
<flag mask="0x00000200" name="Unknown 10"/>
|
||||||
|
<flag mask="0x00000400" name="Unknown 11"/>
|
||||||
|
<flag mask="0x00000800" name="Unknown 12"/>
|
||||||
|
<flag mask="0x00001000" name="Unknown 13"/>
|
||||||
|
<flag mask="0x00002000" name="Unknown 14"/>
|
||||||
|
<flag mask="0x00004000" name="Unknown 15"/>
|
||||||
|
<flag mask="0x00010000" name="Unknown 16"/>
|
||||||
|
<flag mask="0x00020000" name="Unknown 17"/>
|
||||||
</flags>
|
</flags>
|
||||||
</bitfield>
|
</bitfield>
|
||||||
<property ID="0x06" name="Active" type="bool"/>
|
<property ID="0x06" name="Active" type="bool"/>
|
||||||
|
|
Loading…
Reference in New Issue