Misc codestyle fixes

Fryone · Nov 12, 2024 · 542c343 · 542c343
1 parent df0e145
commit 542c343
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 25 deletions.
diff --git a/src/Ext/Anim/Body.cpp b/src/Ext/Anim/Body.cpp
@@ -383,7 +383,7 @@ void AnimExt::InvalidateTechnoPointers(TechnoClass* pTechno)
 		if (!pExt)
 		{
 			auto const ID = pAnim->Type ? pAnim->Type->get_ID() : "N/A";
-			Debug::FatalErrorAndExit(__FUNCTION__": Animation of type[% s] has no ExtData!", ID);
+			Debug::FatalErrorAndExit(__FUNCTION__": Animation of type[%s] has no ExtData!", ID);
 		}
 
 		if (pExt->Invoker == pTechno)
@@ -403,7 +403,7 @@ void AnimExt::InvalidateParticleSystemPointers(ParticleSystemClass* pParticleSys
 		if (!pExt)
 		{
 			auto const ID = pAnim->Type ? pAnim->Type->get_ID() : "N/A";
-			Debug::FatalErrorAndExit(__FUNCTION__": Animation of type[% s] has no ExtData!", ID);
+			Debug::FatalErrorAndExit(__FUNCTION__": Animation of type[%s] has no ExtData!", ID);
 		}
 
 		if (pExt->AttachedSystem == pParticleSystem)

diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.h b/src/Ext/Bullet/Trajectories/PhobosTrajectory.h
@@ -1,13 +1,10 @@
 #pragma once
 
-#include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 #include <Utilities/Savegame.h>
 
 #include <BulletClass.h>
 
-class BulletTypeExt;
-
 enum class TrajectoryFlag : int
 {
 	Invalid = -1,
@@ -33,7 +30,7 @@ class PhobosTrajectoryType
 	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;
+	[[nodiscard]] virtual std::unique_ptr<PhobosTrajectory> CreateInstance() const = 0;
 
 	Valueable<double> Trajectory_Speed { 100.0 };
 };

diff --git a/src/Ext/Rules/Body.cpp b/src/Ext/Rules/Body.cpp
@@ -411,7 +411,7 @@ void RulesExt::ExtData::ReplaceVoxelLightSources()
 	{
 		needCacheFlush = true;
 		auto source = this->VoxelLightSource.Get().Normalized();
-		Game::VoxelLightSource = Matrix3D::VoxelDefaultMatrix.get() * source;
+		Game::VoxelLightSource = Matrix3D::VoxelDefaultMatrix() * source;
 	}
 
 	/*
@@ -420,7 +420,7 @@ void RulesExt::ExtData::ReplaceVoxelLightSources()
 	{
 		needCacheFlush = true;
 		auto source = this->VoxelShadowLightSource.Get().Normalized();
-		Game::VoxelShadowLightSource = Matrix3D::VoxelDefaultMatrix.get() * source;
+		Game::VoxelShadowLightSource = Matrix3D::VoxelDefaultMatrix() * source;
 	}
 	*/
 

diff --git a/src/Ext/Scenario/Hooks.cpp b/src/Ext/Scenario/Hooks.cpp
@@ -8,7 +8,7 @@ DEFINE_HOOK(0x6870D7, ReadScenario_LoadingScreens, 0x5)
 
 	LEA_STACK(CCINIClass*, pINI, STACK_OFFSET(0x174, -0x158));
 
-	auto const pScenario = ScenarioClass::Instance.get();
+	auto const pScenario = ScenarioClass::Instance();
 	auto const scenarioName = pScenario->FileName;
 	auto const defaultsSection = "Defaults";
 

diff --git a/src/Ext/Techno/Body.Internal.cpp b/src/Ext/Techno/Body.Internal.cpp
@@ -80,7 +80,7 @@ CoordStruct TechnoExt::GetBurstFLH(TechnoClass* pThis, int weaponIndex, bool& FL
 	auto const pExt = TechnoTypeExt::ExtMap.Find(pThis->GetTechnoType());
 
 	auto pInf = abstract_cast<InfantryClass*>(pThis);
-	auto pickedFLHs = pExt->WeaponBurstFLHs;
+	std::span<std::vector<CoordStruct>> pickedFLHs = pExt->WeaponBurstFLHs;
 
 	if (pThis->Veterancy.IsElite())
 	{

diff --git a/src/New/Entity/LaserTrailClass.h b/src/New/Entity/LaserTrailClass.h
@@ -1,12 +1,10 @@
 #pragma once
 
 #include <GeneralStructures.h>
-#include <LaserDrawClass.h>
 #include <HouseClass.h>
 
 #include <New/Type/LaserTrailTypeClass.h>
 
-#include <vector>
 
 class LaserTrailClass
 {

diff --git a/src/New/Type/AttachEffectTypeClass.h b/src/New/Type/AttachEffectTypeClass.h
@@ -205,7 +205,7 @@ class AEAttachInfoTypeClass
 	ValueableVector<int> DurationOverrides;
 	ValueableVector<int> Delays;
 	ValueableVector<int> InitialDelays;
-	NullableVector<int> RecreationDelays;
+	ValueableVector<int> RecreationDelays;
 
 	void LoadFromINI(CCINIClass* pINI, const char* pSection);
 	bool Load(PhobosStreamReader& stm, bool registerForChange);

diff --git a/src/Utilities/Container.h b/src/Utilities/Container.h
@@ -344,19 +344,16 @@ class Container
 		if constexpr (HasOffset<T>)
 			ResetExtensionPointer(key);
 
-		if (auto const val = new extension_type(key))
-		{
-			val->EnsureConstanted();
+		auto const val = new extension_type(key);
 
-			if constexpr (HasOffset<T>)
-				SetExtensionPointer(key, val);
+		val->EnsureConstanted();
 
-			this->Items.insert(key, val);
+		if constexpr (HasOffset<T>)
+			SetExtensionPointer(key, val);
 
-			return val;
-		}
+		this->Items.insert(key, val);
 
-		return nullptr;
+		return val;
 	}
 
 	extension_type_ptr TryAllocate(base_type_ptr key, bool bCond, const std::string_view& nMessage)

diff --git a/src/Utilities/Helpers.Alex.h b/src/Utilities/Helpers.Alex.h
@@ -245,7 +245,7 @@ namespace Helpers
 			// Starkku: Reimplemented using AircraftTrackerClass.
 			if (includeInAir)
 			{
-				auto const airTracker = &AircraftTrackerClass::Instance.get();
+				auto const airTracker = &AircraftTrackerClass::Instance;
 				airTracker->FillCurrentVector(MapClass::Instance->GetCellAt(coords), Game::F2I(spread));
 
 				for (auto pTechno = airTracker->Get(); pTechno; pTechno = airTracker->Get())
@@ -413,13 +413,13 @@ namespace Helpers
 		}
 
 		template <typename Value, typename Option>
-		inline bool is_any_of(Value&& value, Option&& option)
+		constexpr bool is_any_of(Value&& value, Option&& option)
 		{
 			return value == option;
 		}
 
 		template <typename Value, typename Option, typename... Options>
-		inline bool is_any_of(Value&& value, Option&& first_option, Options&&... other_options)
+		constexpr bool is_any_of(Value&& value, Option&& first_option, Options&&... other_options)
 		{
 			return value == first_option || is_any_of(std::forward<Value>(value), std::forward<Options>(other_options)...);
 		}