Define ARRAYSIZE as function. Use it where appropriate

FreeSlave · Apr 25, 2024 · 449ad49 · 449ad49
1 parent 19712bf
commit 449ad49
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 28 deletions.
diff --git a/cl_dll/ammo.cpp b/cl_dll/ammo.cpp
@@ -22,6 +22,7 @@
 #include "cl_util.h"
 #include "parsemsg.h"
 #include "pm_shared.h"
+#include "arraysize.h"
 
 #include "ammohistory.h"
 #include "ammoregistry.h"
@@ -141,7 +142,7 @@ void WeaponsResource::AddWeapon(WEAPON *wp)
 {
 	// Check user preferences
 	bool foundUserPreference = false;
-	for (int i=0; i<sizeof(bucketPreferences)/sizeof(bucketPreferences[0]); ++i)
+	for (int i=0; i<ARRAYSIZE(bucketPreferences); ++i)
 	{
 		const BucketPreference& pref = bucketPreferences[i];
 		if (pref.szName[0] == '\0')
@@ -474,7 +475,7 @@ int CHudAmmo::VidInit( void )
 	m_HUD_selection = gHUD.GetSpriteIndex( "selection" );
 
 	char bucketName[8] = "bucket";
-	for (int i=0; i<sizeof(m_HUD_buckets)/sizeof(m_HUD_buckets[0]); ++i)
+	for (int i=0; i<ARRAYSIZE(m_HUD_buckets); ++i)
 	{
 		bucketName[6] = '0' + i + 1;
 		bucketName[7] = '\0';
@@ -1214,7 +1215,7 @@ void DrawAmmoBar( WEAPON *p, int x, int y, int width, int height )
 int CHudAmmo::SpriteIndexForSlot(int iSlot)
 {
 	int result = -1;
-	if (iSlot >=0 && iSlot < sizeof(m_HUD_buckets)/sizeof(m_HUD_buckets[0]))
+	if (iSlot >=0 && iSlot < ARRAYSIZE(m_HUD_buckets))
 	{
 		result = m_HUD_buckets[iSlot];
 	}

diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp
@@ -1427,10 +1427,6 @@ enum EGON_FIREMODE
 #define EGON_SOUND_RUN			"weapons/egon_run3.wav"
 #define EGON_SOUND_STARTUP		"weapons/egon_windup2.wav"
 
-#if !defined(ARRAYSIZE)
-#define ARRAYSIZE(p)		( sizeof(p) /sizeof(p[0]) )
-#endif
-
 BEAM *pBeam;
 BEAM *pBeam2;
 TEMPENTITY *pFlare;	// Vit_amiN: egon's beam flare

diff --git a/cl_dll/hud.cpp b/cl_dll/hud.cpp
@@ -22,6 +22,7 @@
 #include "cl_util.h"
 #include "parsemsg.h"
 #include "parsetext.h"
+#include "arraysize.h"
 #if USE_VGUI
 #include "vgui_int.h"
 #include "vgui_TeamFortressViewport.h"
@@ -183,7 +184,7 @@ class CHLVoiceStatusHelper : public IVoiceStatusHelper
 	{
 		color[0] = color[1] = color[2] = 255;
 
-		if( entindex >= 0 && entindex < sizeof(g_PlayerExtraInfo)/sizeof(g_PlayerExtraInfo[0]) )
+		if( entindex >= 0 && entindex < ARRAYSIZE(g_PlayerExtraInfo) )
 		{
 			int iTeam = g_PlayerExtraInfo[entindex].teamnumber;
 
@@ -918,7 +919,7 @@ void CHud::ParseClientFeatures()
 
 			unsigned int i = 0;
 			bool shouldContinue = true;
-			for (i = 0; shouldContinue && i<sizeof(colors)/sizeof(colors[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(colors); ++i)
 			{
 				if (strcmp(keyName, colors[i].name) == 0)
 				{
@@ -927,7 +928,7 @@ void CHud::ParseClientFeatures()
 					break;
 				}
 			}
-			for (i = 0; shouldContinue && i<sizeof(integers)/sizeof(integers[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(integers); ++i)
 			{
 				if (strcmp(keyName, integers[i].name) == 0)
 				{
@@ -936,7 +937,7 @@ void CHud::ParseClientFeatures()
 					break;
 				}
 			}
-			for (i = 0; shouldContinue && i<sizeof(configurableBooleans)/sizeof(configurableBooleans[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(configurableBooleans); ++i)
 			{
 				if ((subKey = strStartsWith(keyName, configurableBooleans[i].name)))
 				{
@@ -945,7 +946,7 @@ void CHud::ParseClientFeatures()
 					break;
 				}
 			}
-			for (i = 0; shouldContinue && i<sizeof(configurableFloats)/sizeof(configurableFloats[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(configurableFloats); ++i)
 			{
 				if ((subKey = strStartsWith(keyName, configurableFloats[i].name)))
 				{
@@ -954,7 +955,7 @@ void CHud::ParseClientFeatures()
 					break;
 				}
 			}
-			for (i = 0; shouldContinue && i<sizeof(configurableBounds)/sizeof(configurableBounds[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(configurableBounds); ++i)
 			{
 				if ((subKey = strStartsWith(keyName, configurableBounds[i].name)))
 				{
@@ -963,7 +964,7 @@ void CHud::ParseClientFeatures()
 					break;
 				}
 			}
-			for (i = 0; shouldContinue && i<sizeof(booleans)/sizeof(booleans[0]); ++i)
+			for (i = 0; shouldContinue && i<ARRAYSIZE(booleans); ++i)
 			{
 				if (strcmp(keyName, booleans[i].name) == 0)
 				{

diff --git a/cl_dll/hud_caption.cpp b/cl_dll/hud_caption.cpp
@@ -2,6 +2,7 @@
 #include "cl_util.h"
 #include "parsemsg.h"
 #include "parsetext.h"
+#include "arraysize.h"
 
 #include <algorithm>
 
@@ -118,7 +119,7 @@ int CHudCaption::MsgFunc_Caption(const char *pszName, int iSize, void *pbuf)
 
 void CHudCaption::AddSubtitle(const Subtitle_t &sub)
 {
-	if ((unsigned)sub_count < sizeof(subtitles)/sizeof(subtitles[0]))
+	if ((unsigned)sub_count < ARRAYSIZE(subtitles))
 	{
 		subtitles[sub_count] = sub;
 		sub_count++;

diff --git a/cl_dll/hud_msg.cpp b/cl_dll/hud_msg.cpp
@@ -20,6 +20,7 @@
 #include "cl_util.h"
 #include "parsemsg.h"
 #include "r_efx.h"
+#include "arraysize.h"
 
 #define MAX_CLIENTS 32
 
@@ -159,7 +160,7 @@ int CHud::MsgFunc_WallPuffs(const char *pszName, int iSize, void *pbuf)
 	wallPuffs[3] = READ_SHORT();
 
 	wallPuffCount = 0;
-	for (int i=0; i<sizeof(wallPuffs)/sizeof(wallPuffs[0]); ++i)
+	for (int i=0; i<ARRAYSIZE(wallPuffs); ++i)
 	{
 		if (wallPuffs[i])
 			wallPuffCount++;

diff --git a/cl_dll/input_goldsource.cpp b/cl_dll/input_goldsource.cpp
@@ -9,6 +9,7 @@
 // 02/21/97 JCB Added extended DirectInput code to support external controllers.
 
 #include "input_mouse.h"
+#include "arraysize.h"
 
 #if SUPPORT_GOLDSOURCE_INPUT
 
@@ -28,7 +29,6 @@
 #endif
 
 #if USE_SDL2
-#define ARRAYSIZE(p)		( sizeof(p) /sizeof(p[0]) )
 #include <dlfcn.h>
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_gamecontroller.h>

diff --git a/dlls/ammoregistry.cpp b/dlls/ammoregistry.cpp
@@ -11,6 +11,7 @@
 #define AMMO_LOG(...) ALERT(at_aiconsole, ##__VA_ARGS__ )
 #define AMMO_ERROR(...) ALERT(at_error, ##__VA_ARGS__ )
 #endif
+#include "arraysize.h"
 
 
 void AmmoType::SetName(const char *ammoName)
@@ -107,7 +108,7 @@ int AmmoRegistry::IndexOf(const char *name) const
 {
 	if (!name)
 		return -1;
-	for (int i = 0; i<sizeof(ammoTypes)/sizeof(ammoTypes[0]); ++i)
+	for (int i = 0; i<ARRAYSIZE(ammoTypes); ++i)
 	{
 		if (!ammoTypes[i].IsValid())
 			continue;

diff --git a/dlls/gonome.cpp b/dlls/gonome.cpp
@@ -891,7 +891,7 @@ const char *CDeadGonome::m_szPoses[] = { "dead_on_stomach1", "dead_on_back", "de
 
 const char* CDeadGonome::getPos(int pos) const
 {
-	return m_szPoses[pos % (sizeof(m_szPoses)/sizeof(const char*))];
+	return m_szPoses[pos % ARRAYSIZE(m_szPoses)];
 }
 
 LINK_ENTITY_TO_CLASS(monster_gonome_dead, CDeadGonome)

diff --git a/dlls/maprules.cpp b/dlls/maprules.cpp
@@ -1080,7 +1080,7 @@ void CGamePlayerSettings::EquipPlayer(CBaseEntity *pPlayer)
 		SF_PLAYER_SETTINGS_SPORELAUNCHER,
 		SF_PLAYER_SETTINGS_MEDKIT
 	};
-	const int weaponIds[sizeof(weaponFlags)/sizeof(int)] = {
+	const int weaponIds[ARRAYSIZE(weaponFlags)] = {
 		WEAPON_CROWBAR,
 		WEAPON_GLOCK,
 		WEAPON_PYTHON,
@@ -1156,7 +1156,7 @@ void CGamePlayerSettings::EquipPlayer(CBaseEntity *pPlayer)
 		}
 	}
 
-	for (i=0; i<sizeof(weaponFlags)/sizeof(int); ++i)
+	for (i=0; i<ARRAYSIZE(weaponFlags); ++i)
 	{
 		if (pev->spawnflags & weaponFlags[i])
 		{

diff --git a/dlls/saverestore.h b/dlls/saverestore.h
@@ -113,8 +113,6 @@ class CRestore : public CSaveRestoreBuffer
 
 #define MAX_ENTITYARRAY 64
 
-//#define ARRAYSIZE(p)		(sizeof(p)/sizeof(p[0]))
-
 #define IMPLEMENT_SAVERESTORE(derivedClass,baseClass) \
 	int derivedClass::Save( CSave &save )\
 	{\

diff --git a/dlls/zombie.cpp b/dlls/zombie.cpp
@@ -418,7 +418,7 @@ const char *CDeadZombieSoldier::m_szPoses[] = { "dead_on_back", "dead_on_stomach
 
 const char* CDeadZombieSoldier::getPos(int pos) const
 {
-	return m_szPoses[pos % (sizeof(m_szPoses)/sizeof(const char*))];
+	return m_szPoses[pos % ARRAYSIZE(m_szPoses)];
 }
 
 LINK_ENTITY_TO_CLASS( monster_zombie_soldier_dead, CDeadZombieSoldier )

diff --git a/engine/eiface.h b/engine/eiface.h
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include "custom.h"
 #include "cvardef.h"
+#include "arraysize.h"
 //
 // Defines entity interface between engine and DLLs.
 // This header file included by engine files and DLL files.
@@ -383,10 +384,6 @@ typedef struct
 	short		flags;
 } TYPEDESCRIPTION;
 
-#if !defined(ARRAYSIZE)
-#define ARRAYSIZE(p)	(sizeof(p)/sizeof(p[0]))
-#endif
-
 typedef struct 
 {
 	// Initialize/shutdown the game (one-time call after loading of game .dll )

diff --git a/game_shared/arraysize.h b/game_shared/arraysize.h
@@ -0,0 +1,13 @@
+#pragma once
+#ifndef ARRAYSIZE_H
+#define ARRAYSIZE_H
+
+#include <cstddef>
+
+template <typename T, size_t N>
+constexpr size_t ARRAYSIZE(T (&arr)[N]) noexcept
+{
+	return N;
+}
+
+#endif