From 8b4b7f0a26af11e4f7a016bd315c53bf66ddd461 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Thu, 18 Jul 2024 13:44:52 -0700
Subject: [PATCH] Reserve the `id` keyword, fix some struct members to comply

---
 src/client/titles.qc    | 26 +++++++++++++-------------
 src/server/defs.h       |  6 +++---
 src/server/maptweaks.qc |  6 +++---
 src/shared/defs.h       |  2 ++
 src/shared/materials.qc |  6 +++---
 src/shared/sentences.qc |  4 ++--
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/client/titles.qc b/src/client/titles.qc
index fb26a9e6..d81b6190 100644
--- a/src/client/titles.qc
+++ b/src/client/titles.qc
@@ -119,7 +119,7 @@ Titles_Init(void)
 	string temp;
 	int c;
 	int braced;
-	int id = 0;
+	int titleID = 0;
 
 	InitStart();
 
@@ -229,21 +229,21 @@ Titles_Init(void)
 			/*print(sprintf("%s\n",
 					temp));*/
 			/* time to dump the info */
-			g_titles[id].m_strName = t_name;
-			g_titles[id].m_strMessage = t_message;
-			g_titles[id].m_flPosX = t_position[0];
-			g_titles[id].m_flPosY = t_position[1];
-			g_titles[id].m_iEffect = t_effect;
-			g_titles[id].m_vecColor1 = t_color;
-			g_titles[id].m_vecColor2 = t_color2;
-			g_titles[id].m_flFadeIn = t_fadein;
-			g_titles[id].m_flFadeOut = t_fadeout;
-			g_titles[id].m_flHoldTime = t_holdtime;
-			g_titles[id].m_flFXTime = t_fxtime;
+			g_titles[titleID].m_strName = t_name;
+			g_titles[titleID].m_strMessage = t_message;
+			g_titles[titleID].m_flPosX = t_position[0];
+			g_titles[titleID].m_flPosY = t_position[1];
+			g_titles[titleID].m_iEffect = t_effect;
+			g_titles[titleID].m_vecColor1 = t_color;
+			g_titles[titleID].m_vecColor2 = t_color2;
+			g_titles[titleID].m_flFadeIn = t_fadein;
+			g_titles[titleID].m_flFadeOut = t_fadeout;
+			g_titles[titleID].m_flHoldTime = t_holdtime;
+			g_titles[titleID].m_flFXTime = t_fxtime;
 			t_message = "";
 			t_name = "";
 			braced = FALSE;
-			id++;
+			titleID++;
 			break;
 		default:
 			if (braced == TRUE) {
diff --git a/src/server/defs.h b/src/server/defs.h
index b7417fa5..7312e225 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -35,11 +35,11 @@
 	SAVE_STATE(fieldname);\
 }
 
-#define EVALUATE_VECTOR(fieldname, id, changedflag) {\
-	if (VEC_CHANGED(fieldname, id)) {\
+#define EVALUATE_VECTOR(fieldname, idx, changedflag) {\
+	if (VEC_CHANGED(fieldname, idx)) {\
 		SetSendFlags(changedflag);\
 	}\
-	SAVE_STATE_FIELD(fieldname, id);\
+	SAVE_STATE_FIELD(fieldname, idx);\
 }
 
 #define SENDENTITY_BYTE(field, changedflag) {\
diff --git a/src/server/maptweaks.qc b/src/server/maptweaks.qc
index 5d148172..52aa4e9e 100644
--- a/src/server/maptweaks.qc
+++ b/src/server/maptweaks.qc
@@ -98,9 +98,9 @@ MapTweaks_Init(void)
 }
 
 static bool
-MapTweak_Check(int id)
+MapTweak_Check(int num)
 {
-	int segments = tokenize(g_mapTweakTable[id].cvarCheck);
+	int segments = tokenize(g_mapTweakTable[num].cvarCheck);
 
 	/* cvars first */
 	for (int i = 0; i < segments; i += 3) {
@@ -128,7 +128,7 @@ MapTweak_Check(int id)
 		}
 	}
 
-	segments = tokenize(g_mapTweakTable[id].serverinfoCheck);
+	segments = tokenize(g_mapTweakTable[num].serverinfoCheck);
 
 	/* infokeys second */
 	for (int i = 0; i < segments; i += 3) {
diff --git a/src/shared/defs.h b/src/shared/defs.h
index 15e9f726..9de3530d 100644
--- a/src/shared/defs.h
+++ b/src/shared/defs.h
@@ -14,6 +14,8 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+typedef entity id;
+
 /* networking helpers */
 #define NETWORKED_INT(x) int x; int x ##_net;
 #define NETWORKED_FLOAT(x) float x; float x ##_net;
diff --git a/src/shared/materials.qc b/src/shared/materials.qc
index 88149270..816e19eb 100644
--- a/src/shared/materials.qc
+++ b/src/shared/materials.qc
@@ -20,7 +20,7 @@ static int g_mat_total;
 /** hlmaterial to classname mapper table */
 typedef struct
 {
-	string id;
+	string idx;
 	string matclass;
 } hlmaterials_lut;
 
@@ -332,7 +332,7 @@ Materials_Mapper_Init(void)
 			/* tokenize and just parse this stuff in */
 			if (tokenize_console(sTemp) == 2) {
 				if (argv(0) == "gamematerial") {
-					g_hlmlut[c].id = argv(1);
+					g_hlmlut[c].idx = argv(1);
 					g_hlmlut[c].matclass = spname;
 					c++;
 				}
@@ -355,7 +355,7 @@ Materials_Mapper_Lookup(string character)
 	int i;
 
 	for (i = 0; i < g_hlmlut_count; i++)
-		if (g_hlmlut[i].id == character)
+		if (g_hlmlut[i].idx == character)
 			return g_hlmlut[i].matclass;
 
 	return __NULL__;
diff --git a/src/shared/sentences.qc b/src/shared/sentences.qc
index dfee853e..a0d2c18f 100644
--- a/src/shared/sentences.qc
+++ b/src/shared/sentences.qc
@@ -159,9 +159,9 @@ Sentences_GetSamples(string msg)
 }
 
 string
-Sentences_GetString(int id)
+Sentences_GetString(int idx)
 {
-	return g_sentences[id].m_strID;
+	return g_sentences[idx].m_strID;
 }
 #endif