Merge branch 'develop' into develop-trajectory-parabola

Phobos-developers · Oct 4, 2024 · c7a5092 · c7a5092
2 parents 0961d8d + b6f96c9
commit c7a5092
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/src/Ext/Bullet/Hooks.cpp b/src/Ext/Bullet/Hooks.cpp
@@ -307,7 +307,7 @@ DEFINE_HOOK(0x467CCA, BulletClass_AI_TargetSnapChecks, 0x6)
 	{
 		if (auto const pTrajectory = pExt->Trajectory.get())
 		{
-			const TrajectoryFlag flag = pTrajectory->Flag;
+			const TrajectoryFlag flag = pTrajectory->Flag();
 
 			if (flag == TrajectoryFlag::Straight || flag == TrajectoryFlag::Parabola)
 			{
@@ -342,7 +342,7 @@ DEFINE_HOOK(0x468E61, BulletClass_Explode_TargetSnapChecks1, 0x6)
 		{
 			if (auto const pTrajectory = pExt->Trajectory.get())
 			{
-				const TrajectoryFlag flag = pTrajectory->Flag;
+				const TrajectoryFlag flag = pTrajectory->Flag();
 
 				if (flag == TrajectoryFlag::Straight || flag == TrajectoryFlag::Parabola)
 				{
@@ -381,7 +381,7 @@ DEFINE_HOOK(0x468E9F, BulletClass_Explode_TargetSnapChecks2, 0x6)
 		{
 			if (auto const pTrajectory = pExt->Trajectory.get())
 			{
-				const TrajectoryFlag flag = pTrajectory->Flag;
+				const TrajectoryFlag flag = pTrajectory->Flag();
 
 				if (flag == TrajectoryFlag::Straight || flag == TrajectoryFlag::Parabola)
 				{
@@ -404,7 +404,7 @@ DEFINE_HOOK(0x468D3F, BulletClass_ShouldExplode_AirTarget, 0x6)
 	{
 		if (auto const pTrajectory = pExt->Trajectory.get())
 		{
-			const TrajectoryFlag flag = pTrajectory->Flag;
+			const TrajectoryFlag flag = pTrajectory->Flag();
 
 			if (flag == TrajectoryFlag::Straight || flag == TrajectoryFlag::Parabola)
 			{

diff --git a/src/Ext/Bullet/Trajectories/BombardTrajectory.h b/src/Ext/Bullet/Trajectories/BombardTrajectory.h
@@ -5,14 +5,14 @@
 class BombardTrajectoryType final : public PhobosTrajectoryType
 {
 public:
-	BombardTrajectoryType() : PhobosTrajectoryType(TrajectoryFlag::Bombard)
+	BombardTrajectoryType() : PhobosTrajectoryType()
 		, Height { 0.0 }
 	{ }
 
 	virtual bool Load(PhobosStreamReader& Stm, bool RegisterForChange) override;
 	virtual bool Save(PhobosStreamWriter& Stm) const override;
 	virtual std::unique_ptr<PhobosTrajectory> CreateInstance() const override;
-
+	virtual TrajectoryFlag Flag() const { return TrajectoryFlag::Bombard; }
 	virtual void Read(CCINIClass* const pINI, const char* pSection) override;
 
 	Valueable<double> Height;
@@ -27,14 +27,14 @@ class BombardTrajectory final : public PhobosTrajectory
 public:
 	BombardTrajectory(noinit_t) :PhobosTrajectory { noinit_t{} } { }
 
-	BombardTrajectory(BombardTrajectoryType const* trajType) : PhobosTrajectory(TrajectoryFlag::Bombard, trajType->Trajectory_Speed)
+	BombardTrajectory(BombardTrajectoryType const* trajType) : PhobosTrajectory(trajType->Trajectory_Speed)
 		, IsFalling { false }
 		, Height { trajType->Height }
 	{ }
 
 	virtual bool Load(PhobosStreamReader& Stm, bool RegisterForChange) override;
 	virtual bool Save(PhobosStreamWriter& Stm) const override;
-
+	virtual TrajectoryFlag Flag() const { return TrajectoryFlag::Bombard; }
 	virtual void OnUnlimbo(BulletClass* pBullet, CoordStruct* pCoord, BulletVelocity* pVelocity) override;
 	virtual bool OnAI(BulletClass* pBullet) override;
 	virtual void OnAIPreDetonate(BulletClass* pBullet) override { };

diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp b/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp
@@ -61,7 +61,7 @@ void TrajectoryTypePointer::LoadFromINI(CCINIClass* pINI, const char* pSection)
 	flag.Read(exINI, pSection, "Trajectory");// I assume this shit is parsed once and only once, so I keep the impl here
 	if (flag.isset())
 	{
-		if (!_ptr || _ptr->Flag != flag.Get())
+		if (!_ptr || _ptr->Flag() != flag.Get())
 			std::construct_at(this, flag.Get());
 	}
 	if (_ptr)
@@ -96,7 +96,8 @@ bool TrajectoryTypePointer::Save(PhobosStreamWriter& Stm) const
 	Stm.Process(raw);
 	if (raw)
 	{
-		Stm.Process(raw->Flag);
+		auto rtti = raw->Flag();
+		Stm.Process(rtti);
 		return raw->Save(Stm);
 	}
 	return true;
@@ -128,7 +129,6 @@ bool TrajectoryPointer::Load(PhobosStreamReader& Stm, bool registerForChange)
 		if (_ptr.get())
 		{
 			// PhobosSwizzle::RegisterChange(PTR, _ptr.get()); // not used elsewhere yet, if anyone does then reenable this shit
-			_ptr->Flag = flag;
 			return _ptr->Load(Stm, registerForChange);
 		}
 	}
@@ -141,7 +141,8 @@ bool TrajectoryPointer::Save(PhobosStreamWriter& Stm) const
 	Stm.Process(raw);
 	if (raw)
 	{
-		Stm.Process(raw->Flag);
+		auto rtti = raw->Flag();
+		Stm.Process(rtti);
 		return raw->Save(Stm);
 	}
 	return true;
@@ -152,23 +153,20 @@ bool TrajectoryPointer::Save(PhobosStreamWriter& Stm) const
 bool PhobosTrajectoryType::Load(PhobosStreamReader& Stm, bool RegisterForChange)
 {
 	Stm
-		.Process(this->Flag)
 		.Process(this->Trajectory_Speed);
 	return true;
 }
 
 bool PhobosTrajectoryType::Save(PhobosStreamWriter& Stm) const
 {
 	Stm
-		.Process(this->Flag)
 		.Process(this->Trajectory_Speed);
 	return true;
 }
 
 bool PhobosTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
 {
 	Stm
-		.Process(this->Flag)
 		.Process(this->Speed)
 		;
 	return true;
@@ -177,7 +175,6 @@ bool PhobosTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
 bool PhobosTrajectory::Save(PhobosStreamWriter& Stm) const
 {
 	Stm
-		.Process(this->Flag, false)
 		.Process(this->Speed)
 		;
 	return true;

diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.h b/src/Ext/Bullet/Trajectories/PhobosTrajectory.h
@@ -28,39 +28,35 @@ class PhobosTrajectoryType
 {
 public:
 	PhobosTrajectoryType() { }
-	PhobosTrajectoryType(TrajectoryFlag flag) : Flag { flag }, Trajectory_Speed { 100.0 }
-	{ }
 
 	virtual ~PhobosTrajectoryType() noexcept = default;
 	virtual bool Load(PhobosStreamReader& Stm, bool RegisterForChange);
 	virtual bool Save(PhobosStreamWriter& Stm) const;
-
+	virtual TrajectoryFlag Flag() const = 0;
 	virtual void Read(CCINIClass* const pINI, const char* pSection) = 0;
 	virtual std::unique_ptr<PhobosTrajectory> CreateInstance() const = 0;
 
-	TrajectoryFlag Flag;
-	Valueable<double> Trajectory_Speed;
+	Valueable<double> Trajectory_Speed { 100.0 };
 };
 
 class PhobosTrajectory
 {
 public:
 	PhobosTrajectory(noinit_t) { }
-	PhobosTrajectory(TrajectoryFlag flag, double speed = 100.0) : Flag { flag }, Speed { speed }
+	PhobosTrajectory(double speed = 100.0) : Speed { speed }
 	{ }
 
 	virtual ~PhobosTrajectory() noexcept = default;
 	virtual bool Load(PhobosStreamReader& Stm, bool RegisterForChange);
 	virtual bool Save(PhobosStreamWriter& Stm) const;
-
+	virtual TrajectoryFlag Flag() const = 0;
 	virtual void OnUnlimbo(BulletClass* pBullet, CoordStruct* pCoord, BulletVelocity* pVelocity) = 0;
 	virtual bool OnAI(BulletClass* pBullet) = 0;
 	virtual void OnAIPreDetonate(BulletClass* pBullet) = 0;
 	virtual void OnAIVelocity(BulletClass* pBullet, BulletVelocity* pSpeed, BulletVelocity* pPosition) = 0;
 	virtual TrajectoryCheckReturnType OnAITargetCoordCheck(BulletClass* pBullet) = 0;
 	virtual TrajectoryCheckReturnType OnAITechnoCheck(BulletClass* pBullet, TechnoClass* pTechno) = 0;
 
-	TrajectoryFlag Flag;
 	double Speed;
 };
 

diff --git a/src/Ext/Bullet/Trajectories/StraightTrajectory.h b/src/Ext/Bullet/Trajectories/StraightTrajectory.h
@@ -5,7 +5,7 @@
 class StraightTrajectoryType final : public PhobosTrajectoryType
 {
 public:
-	StraightTrajectoryType() : PhobosTrajectoryType(TrajectoryFlag::Straight)
+	StraightTrajectoryType() : PhobosTrajectoryType()
 		, DetonationDistance { Leptons(102) }
 		, ApplyRangeModifiers { false }
 		, TargetSnapDistance { Leptons(128) }
@@ -16,7 +16,7 @@ class StraightTrajectoryType final : public PhobosTrajectoryType
 	virtual bool Save(PhobosStreamWriter& Stm) const override;
 	virtual std::unique_ptr<PhobosTrajectory> CreateInstance() const override;
 	virtual void Read(CCINIClass* const pINI, const char* pSection) override;
-
+	virtual TrajectoryFlag Flag() const { return TrajectoryFlag::Straight; }
 	Valueable<Leptons> DetonationDistance;
 	Valueable<bool> ApplyRangeModifiers;
 	Valueable<Leptons> TargetSnapDistance;
@@ -32,7 +32,7 @@ class StraightTrajectory final : public PhobosTrajectory
 public:
 	StraightTrajectory(noinit_t) :PhobosTrajectory { noinit_t{} } { }
 
-	StraightTrajectory(StraightTrajectoryType const* trajType) : PhobosTrajectory(TrajectoryFlag::Straight, trajType->Trajectory_Speed)
+	StraightTrajectory(StraightTrajectoryType const* trajType) : PhobosTrajectory(trajType->Trajectory_Speed)
 		, DetonationDistance { trajType->DetonationDistance }
 		, TargetSnapDistance { trajType->TargetSnapDistance }
 		, FirerZPosition { 0 }
@@ -42,7 +42,7 @@ class StraightTrajectory final : public PhobosTrajectory
 
 	virtual bool Load(PhobosStreamReader& Stm, bool RegisterForChange) override;
 	virtual bool Save(PhobosStreamWriter& Stm) const override;
-
+	virtual TrajectoryFlag Flag() const { return TrajectoryFlag::Straight; }
 	virtual void OnUnlimbo(BulletClass* pBullet, CoordStruct* pCoord, BulletVelocity* pVelocity) override;
 	virtual bool OnAI(BulletClass* pBullet) override;
 	virtual void OnAIPreDetonate(BulletClass* pBullet) override;