Integer and floating point type cleanup

16-bit, 32-bit, and 64-bit integer type cleanup
32-bit floating point type cleanup

Author: twist84

game/common/havok/hkBase.hpp

@@ -10,8 +10,8 @@ struct hkReferencedObject :
 	public hkBaseObject
 {
 public:
-	short m_size;
-	short m_count;
+	int16 m_size;
+	int16 m_count;
 };
 
 template<typename T>

game/common/havok/hkMath.hpp

@@ -4,7 +4,7 @@
 
 struct hkHalf
 {
-	short m_value;
+	int16 m_value;
 };
 
 struct hkVector4

game/common/havok/hkShape.hpp

@@ -71,7 +71,7 @@ struct hkTriangleShape :
 	public hkConvexShape
 {
 public:
-	unsigned short m_welding_info;
+	uint16 m_welding_info;
 	unsigned char m_welding_type;
 	unsigned char m_is_extruded;
 	hkVector4 m_vertices[3];

game/common/havok/hkWorld.hpp

@@ -37,8 +37,8 @@ struct hkBroadPhaseBorder;
 struct hkMultiThreadLock
 {
 	unsigned int m_threadId;
-	short m_lockCount;
-	unsigned short m_lockBitStack;
+	int16 m_lockCount;
+	uint16 m_lockBitStack;
 };
 
 struct hkStepInfo
@@ -57,7 +57,7 @@ struct hkSolverInfo
 		float m_angularVelocityThresholdInv;
 		float m_slowObjectVelocityMultiplier;
 		float m_relativeSleepVelocityThreshold;
-		unsigned short m_stepsToDeactivate;
+		uint16 m_stepsToDeactivate;
 		float m_maxDistSqrd[2];
 		hkHalf m_maxRotSqrd[2];
 	};
@@ -78,8 +78,8 @@ struct hkSolverInfo
 	hkSolverInfo::DeactivationInfo m_deactivationInfo[6];
 	float m_deltaTime;
 	float m_invDeltaTime;
-	long m_numSteps;
-	long m_numMicroSteps;
+	int32 m_numSteps;
+	int32 m_numMicroSteps;
 	float m_invNumMicroSteps;
 	float m_invNumSteps;
 	hkBool m_forceCoherentConstraintOrderingInSolver;
@@ -124,13 +124,13 @@ struct hkWorld :
 	hkCollisionDispatcher* m_collisionDispatcher;
 	hkConvexListFilter* m_convexListFilter;
 	hkWorldOperationQueue* m_pendingOperations;
-	long m_pendingOperationsCount;
-	long m_criticalOperationsLockCount;
-	long m_criticalOperationsLockCountForPhantoms;
+	int32 m_pendingOperationsCount;
+	int32 m_criticalOperationsLockCount;
+	int32 m_criticalOperationsLockCountForPhantoms;
 	hkBool m_blockExecutingPendingOperations;
 	hkBool m_criticalOperationsAllowed;
 	hkDebugInfoOnPendingOperationQueues* m_pendingOperationQueues;
-	long m_pendingOperationQueueCount;
+	int32 m_pendingOperationQueueCount;
 	hkMultiThreadLock m_multiThreadLock;
 	hkBool m_processActionsInSingleThread;
 	unsigned int m_minDesiredIslandSize;
@@ -150,7 +150,7 @@ struct hkWorld :
 	float m_lowFrequencyDeactivationPeriod;
 	float m_deactivationReferenceDistance;
 	float m_toiCollisionResponseRotateNormal;
-	long m_simulationType;
+	int32 m_simulationType;
 	unsigned int m_lastEntityUid;
 	hkArray<hkPhantom> m_phantoms;
 	hkArray<hkActionListener> m_actionListeners;
@@ -168,10 +168,10 @@ struct hkWorld :
 	hkBroadPhaseBorder* m_broadPhaseBorder;
 	hkWorldDynamicsStepInfo m_dynamicsStepInfo;
 	hkVector4 m_broadPhaseExtents[2];
-	long m_broadPhaseNumMarkers;
-	long m_sizeOfToiEventQueue;
-	long m_broadPhaseQuerySize;
-	long m_broadPhaseUpdateSize;
+	int32 m_broadPhaseNumMarkers;
+	int32 m_sizeOfToiEventQueue;
+	int32 m_broadPhaseQuerySize;
+	int32 m_broadPhaseUpdateSize;
 	signed char m_contactPointGeneration;
 };
 static_assert(sizeof(hkWorld) == 0x320);
@@ -265,10 +265,10 @@ static_assert(sizeof(hkSimulation) == 0x28);
 
 struct hkConstraintInfo
 {
-	long m_maxSizeOfSchema;
-	long m_sizeOfSchemas;
-	long m_numSolverResults;
-	long m_numSolverElemTemps;
+	int32 m_maxSizeOfSchema;
+	int32 m_sizeOfSchemas;
+	int32 m_numSolverResults;
+	int32 m_numSolverElemTemps;
 };
 static_assert(sizeof(hkConstraintInfo) == 0x10);
 
@@ -305,9 +305,9 @@ struct hkSimulationIsland :
 	public hkConstraintOwner
 {
 	hkWorld* m_world;
-	long m_numConstraints;
-	unsigned short m_storageIndex;
-	unsigned short m_dirtyListIndex;
+	int32 m_numConstraints;
+	uint16 m_storageIndex;
+	uint16 m_dirtyListIndex;
 	unsigned char m_splitCheckFrameCounter;
 	unsigned char m_highFrequencyDeactivationCounter;
 	unsigned char m_lowFrequencyDeactivationCounter;

game/common/lib_3dpart/fmod/src/sound_fmod.cpp

@@ -9,7 +9,7 @@ t_value_type<uint32> const max_channels_as_dword = { .value = uint32(MAX_CHANNEL
 t_value_type<uint8> const max_channels_as_byte = { .value = uint8(MAX_CHANNELS) };
 //t_value_type<uint32> const sound_preferences_channel_counts_loop_count = { .value = 0 };
 //t_value_type<uint32> const sound_channels_datum_size = { .value = uint32(MAX_CHANNELS * 0x38) };
-//t_value_type<short[5]> const sound_preferences_channel_counts = { .value = { 112, 112, 18, 12, 0 } };
+//t_value_type<int16[5]> const sound_preferences_channel_counts = { .value = { 112, 112, 18, 12, 0 } };
 
 HOOK_DECLARE_CLASS_MEMBER(0x0064EF50, HALO_SOUND_SYSTEM, LoadCinePreload);
 HOOK_DECLARE_CLASS_MEMBER(0x0064F6B0, HALO_SOUND_SYSTEM, LoadTagParams);
@@ -72,7 +72,7 @@ namespace FMOD
 	HOOK_DECLARE_CALL(0x01369B0D, System_init);
 
 	// `FMOD::System::init`
-	long __stdcall System_init(int system, int maxchannels, unsigned int flags, void* extradriverdata)
+	int32 __stdcall System_init(int system, int maxchannels, unsigned int flags, void* extradriverdata)
 	{
 		return INVOKE(0x013883C1, System_init, system, MAX_CHANNELS, flags, extradriverdata);
 	}
@@ -89,12 +89,12 @@ namespace snd
 	//// result for `SYSTEM_FMOD::sub_4035E0`
 	//DATA_PATCH_DECLARE(0x004035E1, max_channels, max_channels_as_dword.bytes);
 
-	long __cdecl SYSTEM_FMOD::sub_4035E0()
+	int32 __cdecl SYSTEM_FMOD::sub_4035E0()
 	{
 		return MAX_CHANNELS;
 	}
 
-	bool __thiscall SYSTEM_FMOD::Init(long a1, void** a2)
+	bool __thiscall SYSTEM_FMOD::Init(int32 a1, void** a2)
 	{
 		// get pointer to `FMOD::EventSystemI*`
 		static bool(__stdcall * FMOD_EventSystem_Create)(FMOD::EventSystemI**) = reinterpret_cast<decltype(FMOD_EventSystem_Create)>(0x01353A80);
@@ -154,7 +154,7 @@ void __cdecl fmod_initialize()
 {
 	//INVOKE(0x0064E190, fmod_initialize);
 
-	//DECLFUNC(0x004047B0, bool, __thiscall, void*, long, long)(snd::SystemFMod, 256, 1);
+	//DECLFUNC(0x004047B0, bool, __thiscall, void*, int32, int32)(snd::SystemFMod, 256, 1);
 	snd::SystemFMod->__vftable->Init(snd::SystemFMod, 256, 1);
 }
 
@@ -171,9 +171,9 @@ void __cdecl fmod_dispose()
 	snd::SystemFMod->__vftable->Term(snd::SystemFMod);
 }
 
-short __cdecl sound_definition_find_pitch_range_by_pitch_for_looping_sound_find_or_create_sound(struct s_cache_file_sound_definition* sound, real32 pitch_modifier, short pitch_range_index)
+int16 __cdecl sound_definition_find_pitch_range_by_pitch_for_looping_sound_find_or_create_sound(struct s_cache_file_sound_definition* sound, real32 pitch_modifier, int16 pitch_range_index)
 {
-	short result = INVOKE(0x00661C20, sound_definition_find_pitch_range_by_pitch_for_looping_sound_find_or_create_sound, sound, pitch_modifier, pitch_range_index);
+	int16 result = INVOKE(0x00661C20, sound_definition_find_pitch_range_by_pitch_for_looping_sound_find_or_create_sound, sound, pitch_modifier, pitch_range_index);
 	if (result != -1)
 		return result;
 

game/common/lib_3dpart/fmod/src/sound_fmod.hpp

@@ -44,15 +44,15 @@ struct HALO_SOUND_SYSTEM
 {
 	struct HALO_SOUND_SYSTEM_vtbl
 	{
-		long(__thiscall* Init)(HALO_SOUND_SYSTEM*, long, void**);
+		int32(__thiscall* Init)(HALO_SOUND_SYSTEM*, int32, void**);
 		void(__thiscall* Term)(HALO_SOUND_SYSTEM*);
 		void(__thiscall* Update)(HALO_SOUND_SYSTEM*);
 		void(__thiscall* InitForNewMap)(HALO_SOUND_SYSTEM*, void*);
-		long(__thiscall* DisposeFromOldMap)(HALO_SOUND_SYSTEM*);
+		int32(__thiscall* DisposeFromOldMap)(HALO_SOUND_SYSTEM*);
 		void* __func14;
 		void* __func18;
-		long(__thiscall* InitUIScreenSounds)(HALO_SOUND_SYSTEM*);
-		long(__thiscall* TermUIScreenSounds)(HALO_SOUND_SYSTEM*);
+		int32(__thiscall* InitUIScreenSounds)(HALO_SOUND_SYSTEM*);
+		int32(__thiscall* TermUIScreenSounds)(HALO_SOUND_SYSTEM*);
 		void* __func24;
 		void* __func28;
 		void* __func2C;
@@ -62,48 +62,48 @@ struct HALO_SOUND_SYSTEM
 	};
 	HALO_SOUND_SYSTEM_vtbl* __vftable;
 
-	long Init(long a1, void** a2) { return __vftable->Init(this, a1, a2); }
+	int32 Init(int32 a1, void** a2) { return __vftable->Init(this, a1, a2); }
 	void Term() { __vftable->Term(this); }
 	void Update() { __vftable->Update(this); }
 	void InitForNewMap() { __vftable->InitForNewMap(this, 0); }
-	long DisposeFromOldMap() { return __vftable->DisposeFromOldMap(this); }
-	long InitUIScreenSounds() { return __vftable->InitUIScreenSounds(this); }
-	long TermUIScreenSounds() { return __vftable->TermUIScreenSounds(this); }
+	int32 DisposeFromOldMap() { return __vftable->DisposeFromOldMap(this); }
+	int32 InitUIScreenSounds() { return __vftable->InitUIScreenSounds(this); }
+	int32 TermUIScreenSounds() { return __vftable->TermUIScreenSounds(this); }
 
 	static HALO_SOUND_SYSTEM* __cdecl GetInstance();
 	void __thiscall LoadCinePreload();
 	void __thiscall LoadTagParams();
 
 	struct VolumeStruct
 	{
-		long __unknown0;
+		int32 __unknown0;
 		real32 __unknown4;
 	};
 
 	// starts as volume but morths into some data in `FMOD::EventSystemI`
 	real32 Volume;
 
-	long __unknown8;
-	long SampleRate; // 48000
+	int32 __unknown8;
+	int32 SampleRate; // 48000
 	VolumeStruct SfxVolume;
 	VolumeStruct VoiceVolume;
 	VolumeStruct MusicVolume;
 	VolumeStruct MasterVolume;
 	uint32 __flags30;
-	long __unknown34;
-	long __unknown38;
-	long __unknown3C;
-	long __unknown40;
+	int32 __unknown34;
+	int32 __unknown38;
+	int32 __unknown3C;
+	int32 __unknown40;
 	real32 __unknown44;
-	long __unknown48;
+	int32 __unknown48;
 	real32 __unknown4C;
-	long __unknown50;
+	int32 __unknown50;
 	real32 __unknown54;
-	long __unknown58; // 5, SoundEncoding?
+	int32 __unknown58; // 5, SoundEncoding?
 	uint8 __data5C[0x18];
 	HALO_CHANNEL* Channels;
-	long ChannelCount;
-	long MaximumChannelCount;
+	int32 ChannelCount;
+	int32 MaximumChannelCount;
 	uint8 __data80[0x12C];
 	uint8 __data1AC[0x58];
 };
@@ -131,7 +131,7 @@ namespace FMOD
 			void* setPluginPath;
 			void* getVersion;
 			void* getInfo;
-			long(__stdcall* getSystemObject)(EventSystemI*, void*);
+			int32(__stdcall* getSystemObject)(EventSystemI*, void*);
 			void* getMusicSystem;
 			void* load;
 			void* unload;
@@ -199,7 +199,7 @@ namespace FMOD
 	};
 	static_assert(sizeof(EventSystemI) == 0xE4);
 
-	extern long __stdcall System_init(int system, int maxchannels, unsigned int flags, void* extradriverdata);
+	extern int32 __stdcall System_init(int system, int maxchannels, unsigned int flags, void* extradriverdata);
 };
 
 namespace snd
@@ -219,19 +219,19 @@ namespace snd
 		struct SYSTEM_vtbl
 		{
 			void* Destructor;
-			void(__thiscall* Init)(SYSTEM*, long, long);
-			long(__thiscall* Term)(SYSTEM*);
+			void(__thiscall* Init)(SYSTEM*, int32, int32);
+			int32(__thiscall* Term)(SYSTEM*);
 			void* Mute;
 			void* StopAll;
-			long(__thiscall* Update)(SYSTEM*, uint32);
+			int32(__thiscall* Update)(SYSTEM*, uint32);
 			void* GetBuffer;
 			void* Func07;
 			void* Func08;
 			void* RegisterData;
 			void* RegisterLevelSounds;
 			void* RegisterWavebank;
 			void* CommitRegisteredWavebanks;
-			void(__thiscall* UnregisterWavebank)(SYSTEM*, long*);
+			void(__thiscall* UnregisterWavebank)(SYSTEM*, int32*);
 			void* GetRegisteredWavebanks;
 			void* PreloadSoundbank;
 			void* UnloadSoundbank;
@@ -240,14 +240,14 @@ namespace snd
 			void(__thiscall* SetPreset)(SYSTEM*, uint32*);
 			void* Func20;
 			void(__thiscall* Func21)(SYSTEM*, uint32, uint32);
-			void(__thiscall* Func22)(SYSTEM*, long);
+			void(__thiscall* Func22)(SYSTEM*, int32);
 			void* SetListener;
-			void(__thiscall* GetListener)(SYSTEM*, long, uint64*, uint32, uint32, uint32);
+			void(__thiscall* GetListener)(SYSTEM*, int32, uint64*, uint32, uint32, uint32);
 			void* GetInfo;
 			void* GetPlayingIter;
 			void* GetInfoIter;
 			void* FindInfoIter;
-			long(__thiscall* Func29)(SYSTEM*);
+			int32(__thiscall* Func29)(SYSTEM*);
 			void* DropBuffer;
 			void* UpdateListenersCount;
 		};
@@ -262,8 +262,8 @@ namespace snd
 	struct SYSTEM_FMOD :
 		SYSTEM
 	{
-		static long __cdecl sub_4035E0();
-		bool __thiscall Init(long a1, void** a2);
+		static int32 __cdecl sub_4035E0();
+		bool __thiscall Init(int32 a1, void** a2);
 		static bool __cdecl PrepareInit();
 		bool InitEventSystem(void* a1);
 		//void __thiscall Update(real32 a1);

game/source/_force_includes/_force_included_macros.hpp

@@ -33,12 +33,12 @@
 
 #define SIZEOF_BITS(value) 8 * sizeof(value)
 
-const long CHAR_BYTES = sizeof(char);
-const long SHORT_BYTES = sizeof(short);
-const long LONG_BYTES = sizeof(long);
-const long CHAR_BITS = SIZEOF_BITS(char);
-const long SHORT_BITS = SIZEOF_BITS(short);
-const long LONG_BITS = SIZEOF_BITS(long);
+const int32 CHAR_BYTES = sizeof(char);
+const int32 SHORT_BYTES = sizeof(int16);
+const int32 LONG_BYTES = sizeof(int32);
+const int32 CHAR_BITS = SIZEOF_BITS(char);
+const int32 SHORT_BITS = SIZEOF_BITS(int16);
+const int32 LONG_BITS = SIZEOF_BITS(int32);
 
 #define FLAG(bit) (1 << (bit))
 #define MASK(bit) ((1 << (bit)) - 1)
@@ -57,10 +57,10 @@ const long LONG_BITS = SIZEOF_BITS(long);
 //#define CHAR_MAX char(0x7F)
 #define UNSIGNED_CHAR_MAX uint8(0xFF)
 
-//#define SHORT_MAX short(0x7FFF)
+//#define SHORT_MAX int16(0x7FFF)
 #define UNSIGNED_SHORT_MAX uint16(0xFFFF)
 
-//#define LONG_MAX long(0x7FFFFFFF)
+//#define LONG_MAX int32(0x7FFFFFFF)
 #define UNSIGNED_LONG_MAX uint32(0xFFFFFFFF)
 
 #define VALID_CONTROLLER(CONTROLLER) ((CONTROLLER) >= _controller0 && (CONTROLLER) < k_number_of_controllers)