From 33f10e255200f9b3eddedb741af2a37ed94c3b52 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 18 Sep 2019 11:37:36 -0400
Subject: [PATCH] CPlayer: Organize includes

---
 Runtime/World/CPlayer.cpp | 55 +++++++++++++++++++++------------------
 Runtime/World/CPlayer.hpp | 37 +++++++++++++++-----------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp
index 23fb183a9..edd313071 100644
--- a/Runtime/World/CPlayer.cpp
+++ b/Runtime/World/CPlayer.cpp
@@ -1,29 +1,32 @@
-#include "CPlayer.hpp"
-#include "CActorParameters.hpp"
-#include "CStateManager.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "Camera/CBallCamera.hpp"
-#include "Camera/CCinematicCamera.hpp"
-#include "TCastTo.hpp"
-#include "CScriptGrapplePoint.hpp"
-#include "CPatterned.hpp"
-#include "CScriptWater.hpp"
-#include "CDependencyGroup.hpp"
-#include "Character/CSteeringBehaviors.hpp"
-#include "Weapon/CEnergyProjectile.hpp"
-#include "MP1/World/CThardusRockProjectile.hpp"
-#include "MP1/World/CMetroidBeta.hpp"
-#include "Collision/CMetroidAreaCollider.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Input/ControlMapper.hpp"
-#include "CGameState.hpp"
-#include "MP1/CSamusHud.hpp"
-#include "CHUDBillboardEffect.hpp"
-#include "Audio/CStreamAudioManager.hpp"
-#include "CScriptPlayerHint.hpp"
-#include "CScriptAreaAttributes.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/TCastTo.hpp"
+#include "Runtime/Audio/CStreamAudioManager.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Character/CSteeringBehaviors.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CMetroidAreaCollider.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+#include "Runtime/MP1/World/CMetroidBeta.hpp"
+#include "Runtime/MP1/World/CThardusRockProjectile.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
+#include "Runtime/World/CActorParameters.hpp"
+#include "Runtime/World/CHUDBillboardEffect.hpp"
+#include "Runtime/World/CPatterned.hpp"
+#include "Runtime/World/CScriptAreaAttributes.hpp"
+#include "Runtime/World/CScriptGrapplePoint.hpp"
+#include "Runtime/World/CScriptPlayerHint.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CPlayer.hpp b/Runtime/World/CPlayer.hpp
index c5ebe763f..444ab8be8 100644
--- a/Runtime/World/CPlayer.hpp
+++ b/Runtime/World/CPlayer.hpp
@@ -1,32 +1,39 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
-#include "zeus/CAABox.hpp"
-#include "zeus/CTransform.hpp"
-#include "Weapon/CWeaponMgr.hpp"
-#include "CPlayerEnergyDrain.hpp"
-#include "Weapon/CPlayerGun.hpp"
-#include "CMorphBall.hpp"
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "Runtime/Weapon/CPlayerGun.hpp"
+#include "Runtime/Weapon/CWeaponMgr.hpp"
+#include "Runtime/World/CMorphBall.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+#include "Runtime/World/CPlayerEnergyDrain.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CCollidableSphere;
+class CDamageInfo;
+class CFirstPersonCamera;
 class CMaterialList;
 class CMorphBall;
+class CPlayerCameraBob;
 class CPlayerGun;
-class CDamageInfo;
+class CScriptPlayerHint;
 class CScriptWater;
 class IVisitor;
+
 struct CFinalInput;
-class CPlayerCameraBob;
-class CFirstPersonCamera;
-class CCollidableSphere;
-class CScriptPlayerHint;
 
 class CPlayer : public CPhysicsActor {
-  friend class CStateManager;
   friend class CFirstPersonCamera;
-  friend class CPlayerCameraBob;
-  friend class CMorphBall;
   friend class CGroundMovement;
+  friend class CMorphBall;
+  friend class CPlayerCameraBob;
+  friend class CStateManager;
 
 public:
   enum class EPlayerScanState { NotScanning, Scanning, ScanComplete };