minor refactor new trajectory boilerplate

chaserli · chaserli · commit 29efd60311a3 · 2024-09-23T23:56:29.000+08:00
diff --git a/src/Ext/Bullet/Body.cpp b/src/Ext/Bullet/Body.cpp
@@ -214,7 +214,7 @@ DEFINE_HOOK(0x4665E9, BulletClass_DTOR, 0xA)
 	GET(BulletClass*, pItem, ESI);
 
 	if (auto pTraj = BulletExt::ExtMap.Find(pItem)->Trajectory)
-		DLLDelete(pTraj);
+		delete pTraj;
 
 	BulletExt::ExtMap.Remove(pItem);
 	return 0;
diff --git a/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp b/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp
@@ -7,17 +7,23 @@ PhobosTrajectory* BombardTrajectoryType::CreateInstance() const
 	return new BombardTrajectory(this);
 }
 
+template<typename T>
+void BombardTrajectoryType::Serialize(T& Stm)
+{
+	Stm.Process(this->Height);
+}
+
 bool BombardTrajectoryType::Load(PhobosStreamReader& Stm, bool RegisterForChange)
 {
 	this->PhobosTrajectoryType::Load(Stm, false);
-	Stm.Process(this->Height, false);
+	this->Serialize(Stm);
 	return true;
 }
 
 bool BombardTrajectoryType::Save(PhobosStreamWriter& Stm) const
 {
 	this->PhobosTrajectoryType::Save(Stm);
-	Stm.Process(this->Height);
+	const_cast<BombardTrajectoryType*>(this)->Serialize(Stm);
 	return true;
 }
 
@@ -26,14 +32,20 @@ void BombardTrajectoryType::Read(CCINIClass* const pINI, const char* pSection)
 	this->Height = pINI->ReadDouble(pSection, "Trajectory.Bombard.Height", 0.0);
 }
 
-bool BombardTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
+template<typename T>
+void BombardTrajectory::Serialize(T& Stm)
 {
-	this->PhobosTrajectory::Load(Stm, false);
-
 	Stm
 		.Process(this->IsFalling)
 		.Process(this->Height)
 		;
+}
+
+bool BombardTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
+{
+	this->PhobosTrajectory::Load(Stm, false);
+
+	this->Serialize(Stm);
 
 	return true;
 }
@@ -42,10 +54,7 @@ bool BombardTrajectory::Save(PhobosStreamWriter& Stm) const
 {
 	this->PhobosTrajectory::Save(Stm);
 
-	Stm
-		.Process(this->IsFalling)
-		.Process(this->Height)
-		;
+	const_cast<BombardTrajectory*>(this)->Serialize(Stm);
 
 	return true;
 }
diff --git a/src/Ext/Bullet/Trajectories/BombardTrajectory.h b/src/Ext/Bullet/Trajectories/BombardTrajectory.h
@@ -16,15 +16,16 @@ class BombardTrajectoryType final : public PhobosTrajectoryType
 	virtual void Read(CCINIClass* const pINI, const char* pSection) override;
 
 	double Height;
+
+private:
+	template <typename T>
+	void Serialize(T& Stm);
 };
 
 class BombardTrajectory final : public PhobosTrajectory
 {
 public:
-	BombardTrajectory() : PhobosTrajectory(TrajectoryFlag::Bombard)
-		, IsFalling { false }
-		, Height { 0.0 }
-	{}
+	BombardTrajectory(noinit_t) :PhobosTrajectory { noinit_t{} } { }
 
 	BombardTrajectory(PhobosTrajectoryType const* pType) : PhobosTrajectory(TrajectoryFlag::Bombard)
 		, IsFalling { false }
@@ -43,4 +44,8 @@ class BombardTrajectory final : public PhobosTrajectory
 
 	bool IsFalling;
 	double Height;
+
+private:
+	template <typename T>
+	void Serialize(T& Stm);
 };
diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp b/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp
@@ -132,10 +132,10 @@ PhobosTrajectory* PhobosTrajectory::LoadFromStream(PhobosStreamReader& Stm)
 		switch (flag)
 		{
 		case TrajectoryFlag::Straight:
-			pTraj = DLLCreate<StraightTrajectory>();
+			pTraj = new StraightTrajectory(noinit_t {});
 			break;
 		case TrajectoryFlag::Bombard:
-			pTraj = DLLCreate<BombardTrajectory>();
+			pTraj = new BombardTrajectory(noinit_t {});
 			break;
 		default:
 			return nullptr;
diff --git a/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp b/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp
@@ -2,39 +2,35 @@
 #include <Ext/Bullet/Body.h>
 #include <Ext/WeaponType/Body.h>
 
-bool StraightTrajectoryType::Load(PhobosStreamReader& Stm, bool RegisterForChange)
-{
-	this->PhobosTrajectoryType::Load(Stm, false);
-
-	Stm
-		.Process(this->DetonationDistance, false)
-		.Process(this->ApplyRangeModifiers, false)
-		.Process(this->TargetSnapDistance, false)
-		.Process(this->PassThrough, false)
-		;
-
-	return true;
-}
-
 PhobosTrajectory* StraightTrajectoryType::CreateInstance() const
 {
 	return new StraightTrajectory(this);
 }
 
-bool StraightTrajectoryType::Save(PhobosStreamWriter& Stm) const
+template<typename T>
+void StraightTrajectoryType::Serialize(T& Stm)
 {
-	this->PhobosTrajectoryType::Save(Stm);
-
 	Stm
 		.Process(this->DetonationDistance)
 		.Process(this->ApplyRangeModifiers)
 		.Process(this->TargetSnapDistance)
 		.Process(this->PassThrough)
 		;
+}
 
+bool StraightTrajectoryType::Load(PhobosStreamReader& Stm, bool RegisterForChange)
+{
+	this->PhobosTrajectoryType::Load(Stm, false);
+	this->Serialize(Stm);
 	return true;
 }
 
+bool StraightTrajectoryType::Save(PhobosStreamWriter& Stm) const
+{
+	this->PhobosTrajectoryType::Save(Stm);
+	const_cast<StraightTrajectoryType*>(this)->Serialize(Stm);
+	return true;
+}
 
 void StraightTrajectoryType::Read(CCINIClass* const pINI, const char* pSection)
 {
@@ -46,17 +42,22 @@ void StraightTrajectoryType::Read(CCINIClass* const pINI, const char* pSection)
 	this->PassThrough.Read(exINI, pSection, "Trajectory.Straight.PassThrough");
 }
 
-bool StraightTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
+template<typename T>
+void StraightTrajectory::Serialize(T& Stm)
 {
-	this->PhobosTrajectory::Load(Stm, false);
-
 	Stm
 		.Process(this->DetonationDistance)
 		.Process(this->TargetSnapDistance)
 		.Process(this->PassThrough)
 		.Process(this->FirerZPosition)
 		.Process(this->TargetZPosition)
 		;
+}
+
+bool StraightTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)
+{
+	this->PhobosTrajectory::Load(Stm, false);
+	this->Serialize(Stm);
 
 	return true;
 }
@@ -65,13 +66,7 @@ bool StraightTrajectory::Save(PhobosStreamWriter& Stm) const
 {
 	this->PhobosTrajectory::Save(Stm);
 
-	Stm
-		.Process(this->DetonationDistance)
-		.Process(this->TargetSnapDistance)
-		.Process(this->PassThrough)
-		.Process(this->FirerZPosition)
-		.Process(this->TargetZPosition)
-		;
+	const_cast<StraightTrajectory*>(this)->Serialize(Stm);
 
 	return true;
 }
diff --git a/src/Ext/Bullet/Trajectories/StraightTrajectory.h b/src/Ext/Bullet/Trajectories/StraightTrajectory.h
@@ -21,18 +21,16 @@ class StraightTrajectoryType final : public PhobosTrajectoryType
 	Valueable<bool> ApplyRangeModifiers;
 	Valueable<Leptons> TargetSnapDistance;
 	Valueable<bool> PassThrough;
+
+private:
+	template <typename T>
+	void Serialize(T& Stm);
 };
 
 class StraightTrajectory final : public PhobosTrajectory
 {
 public:
-	StraightTrajectory() : PhobosTrajectory(TrajectoryFlag::Straight)
-		, DetonationDistance { Leptons(102) }
-		, TargetSnapDistance { Leptons(128) }
-		, PassThrough { false }
-		, FirerZPosition { 0 }
-		, TargetZPosition { 0 }
-	{}
+	StraightTrajectory(noinit_t) :PhobosTrajectory { noinit_t{} } { }
 
 	StraightTrajectory(PhobosTrajectoryType const* pType) : PhobosTrajectory(TrajectoryFlag::Straight)
 		, DetonationDistance { Leptons(102) }
@@ -63,4 +61,7 @@ class StraightTrajectory final : public PhobosTrajectory
 	int GetFirerZPosition(BulletClass* pBullet);
 	int GetTargetZPosition(BulletClass* pBullet);
 	bool ElevationDetonationCheck(BulletClass* pBullet);
+
+	template <typename T>
+	void Serialize(T& Stm);
 };

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,23 @@ PhobosTrajectory* BombardTrajectoryType::CreateInstance() const`
`7`	`7`	`return new BombardTrajectory(this);`
`8`	`8`	`}`
`9`	`9`
	`10`	`+template<typename T>`
	`11`	`+void BombardTrajectoryType::Serialize(T& Stm)`
	`12`	`+{`
	`13`	`+ Stm.Process(this->Height);`
	`14`	`+}`
	`15`	`+`
`10`	`16`	`bool BombardTrajectoryType::Load(PhobosStreamReader& Stm, bool RegisterForChange)`
`11`	`17`	`{`
`12`	`18`	`this->PhobosTrajectoryType::Load(Stm, false);`
`13`		`- Stm.Process(this->Height, false);`
	`19`	`+ this->Serialize(Stm);`
`14`	`20`	`return true;`
`15`	`21`	`}`
`16`	`22`
`17`	`23`	`bool BombardTrajectoryType::Save(PhobosStreamWriter& Stm) const`
`18`	`24`	`{`
`19`	`25`	`this->PhobosTrajectoryType::Save(Stm);`
`20`		`- Stm.Process(this->Height);`
	`26`	`+ const_cast<BombardTrajectoryType*>(this)->Serialize(Stm);`
`21`	`27`	`return true;`
`22`	`28`	`}`
`23`	`29`
`@@ -26,14 +32,20 @@ void BombardTrajectoryType::Read(CCINIClass* const pINI, const char* pSection)`
`26`	`32`	`this->Height = pINI->ReadDouble(pSection, "Trajectory.Bombard.Height", 0.0);`
`27`	`33`	`}`
`28`	`34`
`29`		`-bool BombardTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)`
	`35`	`+template<typename T>`
	`36`	`+void BombardTrajectory::Serialize(T& Stm)`
`30`	`37`	`{`
`31`		`- this->PhobosTrajectory::Load(Stm, false);`
`32`		`-`
`33`	`38`	`Stm`
`34`	`39`	`.Process(this->IsFalling)`
`35`	`40`	`.Process(this->Height)`
`36`	`41`	`;`
	`42`	`+}`
	`43`	`+`
	`44`	`+bool BombardTrajectory::Load(PhobosStreamReader& Stm, bool RegisterForChange)`
	`45`	`+{`
	`46`	`+ this->PhobosTrajectory::Load(Stm, false);`
	`47`	`+`
	`48`	`+ this->Serialize(Stm);`
`37`	`49`
`38`	`50`	`return true;`
`39`	`51`	`}`
`@@ -42,10 +54,7 @@ bool BombardTrajectory::Save(PhobosStreamWriter& Stm) const`
`42`	`54`	`{`
`43`	`55`	`this->PhobosTrajectory::Save(Stm);`
`44`	`56`
`45`		`- Stm`
`46`		`- .Process(this->IsFalling)`
`47`		`- .Process(this->Height)`
`48`		`- ;`
	`57`	`+ const_cast<BombardTrajectory*>(this)->Serialize(Stm);`
`49`	`58`
`50`	`59`	`return true;`
`51`	`60`	`}`