Link CScriptVisorFlare

Former-commit-id: 0680d336c94b3649210ea66c77bf0509e06691db

configure.py

@@ -546,7 +546,7 @@ config.libs = [
             Object(NonMatching, "MetroidPrime/ScriptObjects/CFishCloud.cpp"),
             Object(Matching, "MetroidPrime/CHealthInfo.cpp"),
             Object(NonMatching, "MetroidPrime/Player/CGameState.cpp"),
-            Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptVisorFlare.cpp"),
+            Object(Matching, "MetroidPrime/ScriptObjects/CScriptVisorFlare.cpp"),
             Object(
                 NonMatching, "MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp"
             ),

include/MetroidPrime/CVisorFlare.hpp

@@ -1,11 +1,13 @@
 #ifndef _CVISORFLARE
 #define _CVISORFLARE
 
-#include "Kyoto/TToken.hpp"
 #include "Kyoto/Graphics/CColor.hpp"
+#include "Kyoto/TToken.hpp"
+
 
-#include "rstl/vector.hpp"
 #include "rstl/optional_object.hpp"
+#include "rstl/vector.hpp"
+
 
 class CTexture;
 class CStateManager;
@@ -40,6 +42,14 @@ public:
     float GetScale() const { return xc_scale; }
   };
 
+  CVisorFlare(EBlendMode blendMode, bool, float, float, float, uint, uint,
+              const rstl::vector< CFlareDef >& flares);
+  ~CVisorFlare() {}
+
+  void Update(float dt, const CVector3f& pos, const CActor* act, CStateManager& mgr);
+  void Render(const CVector3f& pos, const CStateManager& mgr) const;
+  static rstl::optional_object< CFlareDef > LoadFlareDef(CInputStream& in);
+
 private:
   EBlendMode x0_blendMode;
   rstl::vector< CFlareDef > x4_flareDefs;
@@ -56,14 +66,6 @@ private:
   void ResetTevSwapMode(const CStateManager& mgr) const;
   void DrawDirect(const CColor& color, float f1, float f2) const;
   void DrawStreamed(const CColor& color, float f1, float f2) const;
-
-public:
-  CVisorFlare(EBlendMode blendMode, bool, float, float, float, uint, uint, const rstl::vector<CFlareDef>& flares);
-  ~CVisorFlare() {}
-
-  void Update(float dt, const CVector3f& pos, const CActor* act, CStateManager& mgr);
-  void Render(const CVector3f& pos, const CStateManager& mgr) const;
-  static rstl::optional_object<CFlareDef> LoadFlareDef(CInputStream& in);
 };
 
 #endif // _CVISORFLARE

src/MetroidPrime/ScriptObjects/CScriptVisorFlare.cpp

@@ -4,6 +4,9 @@
 #include "MetroidPrime/CStateManager.hpp"
 #include "MetroidPrime/Player/CPlayer.hpp"
 
+// TODO inline depth hack
+#pragma inline_max_size(200)
+
 CScriptVisorFlare::CScriptVisorFlare(TUniqueId uid, const rstl::string& name,
                                      const CEntityInfo& info, bool active, const CVector3f& pos,
                                      CVisorFlare::EBlendMode blendMode, bool b1, float f1, float f2,