Fix compilation

include/Kyoto/Particles/CElementGen.hpp

@@ -3,8 +3,11 @@
 
 #include "types.h"
 
+#include "Kyoto/TToken.hpp"
 #include "Kyoto/Particles/CParticleGen.hpp"
 
+class CGenDescription;
+
 class CElementGen : public CParticleGen {
 public:
   enum EModelOrientationType { kMOT_Normal, kMOT_One };

include/MetroidPrime/CModelData.hpp

@@ -21,6 +21,7 @@ class CAnimRes;
 class CFrustumPlanes;
 class CModel;
 class CModelFlags;
+class CStateManager;
 
 // TODO move
 #include "Kyoto/Math/CQuaternion.hpp"

include/MetroidPrime/Player/CFidget.hpp

@@ -2,23 +2,7 @@
 
 #include "types.h"
 
-// TODO CGunMotion?
-namespace SamusGun {
-enum EAnimationState {
-  kAS_Wander,
-  kAS_Fidget,
-  kAS_Struck,
-  kAS_FreeLook,
-  kAS_ComboFire,
-  kAS_Idle,
-  kAS_BasePosition,
-};
-enum EFidgetType {
-  kFT_Invalid = -1,
-  kFT_Minor,
-  kFT_Major,
-};
-} // namespace SamusGun
+#include "MetroidPrime/Weapons/GunController/CGunMotion.hpp"
 
 class CStateManager;
 

include/MetroidPrime/Weapons/GunController/CGunMotion.hpp

@@ -1,11 +1,33 @@
 #ifndef _CGUNMOTION_HPP
 #define _CGUNMOTION_HPP
 
+#include "MetroidPrime/CModelData.hpp"
+
+#include "Kyoto/CToken.hpp"
 #include "Kyoto/CObjectReference.hpp"
 
+#include "rstl/vector.hpp"
+
 class CVector3f;
 class CStateManager;
 
+namespace SamusGun {
+enum EAnimationState {
+  kAS_Wander,
+  kAS_Fidget,
+  kAS_Struck,
+  kAS_FreeLook,
+  kAS_ComboFire,
+  kAS_Idle,
+  kAS_BasePosition,
+};
+enum EFidgetType {
+  kFT_Invalid = -1,
+  kFT_Minor,
+  kFT_Major,
+};
+} // namespace SamusGun
+
 class CGunMotion {
 public:
   CGunMotion(CAssetId ancsId, const CVector3f& scale);

src/MetroidPrime/CObjectList.cpp

@@ -30,16 +30,30 @@ void CObjectList::AddObject(CEntity& ent) {
 
 void CObjectList::RemoveObject(TUniqueId uid) {}
 
-CEntity* CObjectList::GetObjectById() {}
+CEntity* CObjectList::GetObjectById() {
+  return nullptr;
+}
 
-const CEntity* CObjectList::GetObjectById() const {}
+const CEntity* CObjectList::GetObjectById() const {
+  return nullptr;
+}
 
-CEntity* CObjectList::GetValidObjectById(TUniqueId uid) {}
+CEntity* CObjectList::GetValidObjectById(TUniqueId uid) {
+  return nullptr;
+}
 
-const CEntity* CObjectList::GetValidObjectById(TUniqueId uid) const {}
+const CEntity* CObjectList::GetValidObjectById(TUniqueId uid) const {
+  return nullptr;
+}
 
-CEntity* CObjectList::operator[](int idx) {}
+CEntity* CObjectList::operator[](int idx) {
+  return nullptr;
+}
 
-const CEntity* CObjectList::operator[](int idx) const {}
+const CEntity* CObjectList::operator[](int idx) const {
+  return nullptr;
+}
 
-const CEntity* CObjectList::GetValidObjectByIndex(int idx) const {}
+const CEntity* CObjectList::GetValidObjectByIndex(int idx) const {
+  return nullptr;
+}

src/MetroidPrime/Weapons/GunController/CGunMotion.cpp

@@ -0,0 +1 @@
+#include "MetroidPrime/Weapons/GunController/CGunMotion.hpp"