From 698badd39d67cf857dc4f7b9809c178c762d1182 Mon Sep 17 00:00:00 2001
From: Henrique Gemignani Passos Lima <henrique@gemignani.org>
Date: Thu, 6 Oct 2022 23:40:18 +0300
Subject: [PATCH] Fix compilation

Former-commit-id: a6a103de01c21f4511d8951e1e5670fdbd8843a1
---
 include/Kyoto/Particles/CElementGen.hpp       |  3 ++
 include/MetroidPrime/CModelData.hpp           |  1 +
 include/MetroidPrime/Player/CFidget.hpp       | 18 +-----------
 .../Weapons/GunController/CGunMotion.hpp      | 22 +++++++++++++++
 src/MetroidPrime/CObjectList.cpp              | 28 ++++++++++++++-----
 .../Weapons/GunController/CGunMotion.cpp      |  1 +
 6 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 src/MetroidPrime/Weapons/GunController/CGunMotion.cpp

diff --git a/include/Kyoto/Particles/CElementGen.hpp b/include/Kyoto/Particles/CElementGen.hpp
index 3b444e55..9be1d141 100644
--- a/include/Kyoto/Particles/CElementGen.hpp
+++ b/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 };
diff --git a/include/MetroidPrime/CModelData.hpp b/include/MetroidPrime/CModelData.hpp
index 8d33dbf6..7a07557b 100644
--- a/include/MetroidPrime/CModelData.hpp
+++ b/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"
diff --git a/include/MetroidPrime/Player/CFidget.hpp b/include/MetroidPrime/Player/CFidget.hpp
index f589b537..4325cef8 100644
--- a/include/MetroidPrime/Player/CFidget.hpp
+++ b/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;
 
diff --git a/include/MetroidPrime/Weapons/GunController/CGunMotion.hpp b/include/MetroidPrime/Weapons/GunController/CGunMotion.hpp
index ad565e38..1ee24cf9 100644
--- a/include/MetroidPrime/Weapons/GunController/CGunMotion.hpp
+++ b/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);
diff --git a/src/MetroidPrime/CObjectList.cpp b/src/MetroidPrime/CObjectList.cpp
index 308c558c..cc834377 100644
--- a/src/MetroidPrime/CObjectList.cpp
+++ b/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;
+}
diff --git a/src/MetroidPrime/Weapons/GunController/CGunMotion.cpp b/src/MetroidPrime/Weapons/GunController/CGunMotion.cpp
new file mode 100644
index 00000000..5ed460e6
--- /dev/null
+++ b/src/MetroidPrime/Weapons/GunController/CGunMotion.cpp
@@ -0,0 +1 @@
+#include "MetroidPrime/Weapons/GunController/CGunMotion.hpp"