AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CBurstFire: Tidy up includes 

Includes all necessary headers and uses a forward declaration where
applicable. Ensures inclusion changes in other headers don't break the compilation
of these headers and source files.
This commit is contained in:
Lioncash 2019-09-22 09:26:46 -04:00
parent 2e8eec91ea
commit adf9610138
4 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Weapon/CBurstFire.cpp
View File

@ -1,5 +1,12 @@
#include "CBurstFire.hpp" #include "Runtime/Weapon/CBurstFire.hpp"
#include "GameGlobalObjects.hpp"
#include <algorithm>
#include <cmath>
#include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/CStateManager.hpp"
#include <zeus/Math.hpp>
namespace urde { namespace urde {
CBurstFire::CBurstFire(const SBurst** burstDefs, s32 firstBurstCount) : x10_firstBurstCounter(firstBurstCount) { CBurstFire::CBurstFire(const SBurst** burstDefs, s32 firstBurstCount) : x10_firstBurstCounter(firstBurstCount) {

6
Runtime/Weapon/CBurstFire.hpp
View File

@ -1,8 +1,12 @@
#pragma once #pragma once
#include "CStateManager.hpp" #include "Runtime/GCNTypes.hpp"
#include "Runtime/rstl.hpp"
#include <zeus/CVector3f.hpp>
namespace urde { namespace urde {
class CStateManager;
struct SBurst { struct SBurst {
s32 x0_randomSelectionWeight; s32 x0_randomSelectionWeight;
s32 x4_shotAngles[8]; s32 x4_shotAngles[8];

31
Runtime/World/CScriptGunTurret.cpp
View File

@ -1,17 +1,20 @@
#include "CScriptGunTurret.hpp" #include "Runtime/World/CScriptGunTurret.hpp"
#include "GameGlobalObjects.hpp"
#include "CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Particle/CGenDescription.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "Particle/CElementGen.hpp" #include "Runtime/Character/CPASAnimParmData.hpp"
#include "Weapon/CGameProjectile.hpp" #include "Runtime/Collision/CCollisionActor.hpp"
#include "World/CGameLight.hpp" #include "Runtime/Collision/CCollisionActorManager.hpp"
#include "Collision/CCollisionActorManager.hpp" #include "Runtime/Graphics/CBooRenderer.hpp"
#include "Collision/CCollisionActor.hpp" #include "Runtime/Particle/CElementGen.hpp"
#include "CPlayer.hpp" #include "Runtime/Particle/CGenDescription.hpp"
#include "Character/CPASAnimParmData.hpp" #include "Runtime/Weapon/CEnergyProjectile.hpp"
#include "Graphics/CBooRenderer.hpp" #include "Runtime/Weapon/CGameProjectile.hpp"
#include "Runtime/World/CAiFuncMap.hpp"
#include "Runtime/World/CGameLight.hpp"
#include "Runtime/World/CPlayer.hpp"
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
#include "Weapon/CEnergyProjectile.hpp"
namespace urde { namespace urde {
@ -150,6 +153,8 @@ CScriptGunTurret::CScriptGunTurret(TUniqueId uid, std::string_view name, ETurret
x37c_projectileInfo.Token().Lock(); x37c_projectileInfo.Token().Lock();
} }
CScriptGunTurret::~CScriptGunTurret() = default;
void CScriptGunTurret::Accept(IVisitor& visitor) { visitor.Visit(this); } void CScriptGunTurret::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptGunTurret::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CScriptGunTurret::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {

22
Runtime/World/CScriptGunTurret.hpp
View File

@ -1,15 +1,24 @@
#pragma once #pragma once
#include <Runtime/Weapon/CBurstFire.hpp> #include <memory>
#include <optional>
#include <string_view>
#include "CPhysicsActor.hpp" #include "Runtime/Weapon/CBurstFire.hpp"
#include "CDamageInfo.hpp" #include "Runtime/Weapon/CProjectileInfo.hpp"
#include "CDamageVulnerability.hpp" #include "Runtime/World/CDamageInfo.hpp"
#include "Weapon/CProjectileInfo.hpp" #include "Runtime/World/CDamageVulnerability.hpp"
#include "Weapon/CBurstFire.hpp" #include "Runtime/World/CPhysicsActor.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CVector3f.hpp>
namespace urde { namespace urde {
class CCollisionActorManager; class CCollisionActorManager;
class CElementGen;
enum class EStateMsg;
class CScriptGunTurretData { class CScriptGunTurretData {
float x0_intoDeactivateDelay; float x0_intoDeactivateDelay;
float x4_intoActivateDelay; float x4_intoActivateDelay;
@ -220,6 +229,7 @@ public:
const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabb, const CHealthInfo& hInfo, const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabb, const CHealthInfo& hInfo,
const CDamageVulnerability& dVuln, const CActorParameters& aParms, const CDamageVulnerability& dVuln, const CActorParameters& aParms,
const CScriptGunTurretData& turretData); const CScriptGunTurretData& turretData);
~CScriptGunTurret() override;
void Accept(IVisitor&) override; void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;