From: Rudolf Polzer <divVerent@gmail.com>
Date: Wed, 22 Jan 2025 14:16:52 +0000 (-0500)
Subject: FTEQCC compile fixes for fields with accidentally wrong types.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec21272c7313c0d59056e974112ea2fb1fdaf6cd;p=xonotic%2Fxonotic-data.pk3dir.git

FTEQCC compile fixes for fields with accidentally wrong types.

No idea why this even compiled before in GMQCC...
---

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index a980f4593..12c0f6acd 100644
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -51,9 +51,9 @@ CLASS(ArmorSmall, Armor)
 /* minsize      */ ATTRIB(ArmorSmall, m_mins, vector, ITEM_S_MINS);
 /* maxsize      */ ATTRIB(ArmorSmall, m_maxs, vector, ITEM_S_MAXS);
 /* itemid       */ ATTRIB(ArmorSmall, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(ArmorSmall, m_respawntime, float, GET(g_pickup_respawntime_armor_small));
-/*              */ ATTRIB(ArmorSmall, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_armor_small));
-/* pickupanyway */ ATTRIB(ArmorSmall, m_pickupanyway, float, GET(g_pickup_armorsmall_anyway));
+/* respawntime  */ ATTRIB(ArmorSmall, m_respawntime, float(), GET(g_pickup_respawntime_armor_small));
+/*              */ ATTRIB(ArmorSmall, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_armor_small));
+/* pickupanyway */ ATTRIB(ArmorSmall, m_pickupanyway, float(), GET(g_pickup_armorsmall_anyway));
 /* iteminit     */ ATTRIB(ArmorSmall, m_iteminit, void(Pickup this, entity item), item_armorsmall_init);
 #endif
 ENDCLASS(ArmorSmall)
@@ -100,9 +100,9 @@ CLASS(ArmorMedium, Armor)
 /* minsize      */ ATTRIB(ArmorMedium, m_mins, vector, ITEM_S_MINS);
 /* maxsize      */ ATTRIB(ArmorMedium, m_maxs, vector, ITEM_S_MAXS);
 /* itemid       */ ATTRIB(ArmorMedium, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(ArmorMedium, m_respawntime, float, GET(g_pickup_respawntime_armor_medium));
-/*              */ ATTRIB(ArmorMedium, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_armor_medium));
-/* pickupanyway */ ATTRIB(ArmorMedium, m_pickupanyway, float, GET(g_pickup_armormedium_anyway));
+/* respawntime  */ ATTRIB(ArmorMedium, m_respawntime, float(), GET(g_pickup_respawntime_armor_medium));
+/*              */ ATTRIB(ArmorMedium, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_armor_medium));
+/* pickupanyway */ ATTRIB(ArmorMedium, m_pickupanyway, float(), GET(g_pickup_armormedium_anyway));
 /* iteminit     */ ATTRIB(ArmorMedium, m_iteminit, void(Pickup this, entity item), item_armormedium_init);
 #endif
 ENDCLASS(ArmorMedium)
@@ -149,9 +149,9 @@ CLASS(ArmorBig, Armor)
 /* wptext       */ ATTRIB(ArmorBig, m_waypoint, string, _("Big armor"));
 #ifdef SVQC
 /* itemid       */ ATTRIB(ArmorBig, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(ArmorBig, m_respawntime, float, GET(g_pickup_respawntime_armor_big));
-/*              */ ATTRIB(ArmorBig, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_armor_big));
-/* pickupanyway */ ATTRIB(ArmorBig, m_pickupanyway, float, GET(g_pickup_armorbig_anyway));
+/* respawntime  */ ATTRIB(ArmorBig, m_respawntime, float(), GET(g_pickup_respawntime_armor_big));
+/*              */ ATTRIB(ArmorBig, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_armor_big));
+/* pickupanyway */ ATTRIB(ArmorBig, m_pickupanyway, float(), GET(g_pickup_armorbig_anyway));
 /* iteminit     */ ATTRIB(ArmorBig, m_iteminit, void(Pickup this, entity item), item_armorbig_init);
 #endif
 ENDCLASS(ArmorBig)
@@ -200,9 +200,9 @@ CLASS(ArmorMega, Armor)
 #ifdef SVQC
 /* maxsize      */ ATTRIB(ArmorMega, m_maxs, vector, ITEM_L_MAXS);
 /* itemid       */ ATTRIB(ArmorMega, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(ArmorMega, m_respawntime, float, GET(g_pickup_respawntime_armor_mega));
-/*              */ ATTRIB(ArmorMega, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_armor_mega));
-/* pickupanyway */ ATTRIB(ArmorMega, m_pickupanyway, float, GET(g_pickup_armormega_anyway));
+/* respawntime  */ ATTRIB(ArmorMega, m_respawntime, float(), GET(g_pickup_respawntime_armor_mega));
+/*              */ ATTRIB(ArmorMega, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_armor_mega));
+/* pickupanyway */ ATTRIB(ArmorMega, m_pickupanyway, float(), GET(g_pickup_armormega_anyway));
 /* iteminit     */ ATTRIB(ArmorMega, m_iteminit, void(Pickup this, entity item), item_armormega_init);
 #endif
 ENDCLASS(ArmorMega)
diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index 6db81bf61..b8bc83ff4 100644
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -51,9 +51,9 @@ CLASS(HealthSmall, Health)
 /* minsize      */ ATTRIB(HealthSmall, m_mins, vector, ITEM_S_MINS);
 /* maxsize      */ ATTRIB(HealthSmall, m_maxs, vector, ITEM_S_MAXS);
 /* itemid       */ ATTRIB(HealthSmall, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(HealthSmall, m_respawntime, float, GET(g_pickup_respawntime_health_small));
-/*              */ ATTRIB(HealthSmall, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_health_small));
-/* pickupanyway */ ATTRIB(HealthSmall, m_pickupanyway, float, GET(g_pickup_healthsmall_anyway));
+/* respawntime  */ ATTRIB(HealthSmall, m_respawntime, float(), GET(g_pickup_respawntime_health_small));
+/*              */ ATTRIB(HealthSmall, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_health_small));
+/* pickupanyway */ ATTRIB(HealthSmall, m_pickupanyway, float(), GET(g_pickup_healthsmall_anyway));
 /* iteminit     */ ATTRIB(HealthSmall, m_iteminit, void(Pickup this, entity item), item_healthsmall_init);
 #endif
 ENDCLASS(HealthSmall)
@@ -100,9 +100,9 @@ CLASS(HealthMedium, Health)
 /* minsize      */ ATTRIB(HealthMedium, m_mins, vector, ITEM_S_MINS);
 /* maxsize      */ ATTRIB(HealthMedium, m_maxs, vector, ITEM_S_MAXS);
 /* itemid       */ ATTRIB(HealthMedium, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(HealthMedium, m_respawntime, float, GET(g_pickup_respawntime_health_medium));
-/*              */ ATTRIB(HealthMedium, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_health_medium));
-/* pickupanyway */ ATTRIB(HealthMedium, m_pickupanyway, float, GET(g_pickup_healthmedium_anyway));
+/* respawntime  */ ATTRIB(HealthMedium, m_respawntime, float(), GET(g_pickup_respawntime_health_medium));
+/*              */ ATTRIB(HealthMedium, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_health_medium));
+/* pickupanyway */ ATTRIB(HealthMedium, m_pickupanyway, float(), GET(g_pickup_healthmedium_anyway));
 /* iteminit     */ ATTRIB(HealthMedium, m_iteminit, void(Pickup this, entity item), item_healthmedium_init);
 #endif
 ENDCLASS(HealthMedium)
@@ -149,9 +149,9 @@ CLASS(HealthBig, Health)
 /* wptext       */ ATTRIB(HealthBig, m_waypoint, string, _("Big health"));
 #ifdef SVQC
 /* itemid       */ ATTRIB(HealthBig, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(HealthBig, m_respawntime, float, GET(g_pickup_respawntime_health_big));
-/*              */ ATTRIB(HealthBig, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_health_big));
-/* pickupanyway */ ATTRIB(HealthBig, m_pickupanyway, float, GET(g_pickup_healthbig_anyway));
+/* respawntime  */ ATTRIB(HealthBig, m_respawntime, float(), GET(g_pickup_respawntime_health_big));
+/*              */ ATTRIB(HealthBig, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_health_big));
+/* pickupanyway */ ATTRIB(HealthBig, m_pickupanyway, float(), GET(g_pickup_healthbig_anyway));
 /* iteminit     */ ATTRIB(HealthBig, m_iteminit, void(Pickup this, entity item), item_healthbig_init);
 #endif
 ENDCLASS(HealthBig)
@@ -200,9 +200,9 @@ CLASS(HealthMega, Health)
 #ifdef SVQC
 /* maxsize      */ ATTRIB(HealthMega, m_maxs, vector, ITEM_L_MAXS);
 /* itemid       */ ATTRIB(HealthMega, m_itemid, int, IT_RESOURCE);
-/* respawntime  */ ATTRIB(HealthMega, m_respawntime, float, GET(g_pickup_respawntime_health_mega));
-/*              */ ATTRIB(HealthMega, m_respawntimejitter, float, GET(g_pickup_respawntimejitter_health_mega));
-/* pickupanyway */ ATTRIB(HealthMega, m_pickupanyway, float, GET(g_pickup_healthmega_anyway));
+/* respawntime  */ ATTRIB(HealthMega, m_respawntime, float(), GET(g_pickup_respawntime_health_mega));
+/*              */ ATTRIB(HealthMega, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_health_mega));
+/* pickupanyway */ ATTRIB(HealthMega, m_pickupanyway, float(), GET(g_pickup_healthmega_anyway));
 /* iteminit     */ ATTRIB(HealthMega, m_iteminit, void(Pickup this, entity item), item_healthmega_init);
 #endif
 ENDCLASS(HealthMega)
diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh
index 03294ffb8..358c70981 100644
--- a/qcsrc/common/items/item/jetpack.qh
+++ b/qcsrc/common/items/item/jetpack.qh
@@ -33,7 +33,7 @@ CLASS(Jetpack, Powerup)
 #ifdef GAMEQC
 /* spawnflags */ ATTRIB(Jetpack, spawnflags, int, ITEM_FLAG_NORMAL);
 /* model      */ ATTRIB(Jetpack, m_model, Model, MDL_Jetpack_ITEM);
-/* sound      */ ATTRIB(Jetpack, m_itemid, Sound, IT_JETPACK);
+/* sound      */ ATTRIB(Jetpack, m_itemid, int, IT_JETPACK);
 #endif
 /* refname    */ ATTRIB(Jetpack, netname, string, "jetpack");
 /* itemname   */ ATTRIB(Jetpack, m_name, string, _("Jetpack"));
diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh
index d263a0a96..ed9909998 100644
--- a/qcsrc/common/mutators/mutator/instagib/items.qh
+++ b/qcsrc/common/mutators/mutator/instagib/items.qh
@@ -37,8 +37,8 @@ CLASS(VaporizerCells, Ammo)
 #ifdef SVQC
 /* botvalue    */ ATTRIB(VaporizerCells, m_botvalue, int, 2000);
 /* itemid      */ ATTRIB(VaporizerCells, m_itemid, int, IT_RESOURCE);
-/* respawntime */ ATTRIB(VaporizerCells, m_respawntime, float, GET(instagib_respawntime_ammo));
-/*             */ ATTRIB(VaporizerCells, m_respawntimejitter, float, GET(instagib_respawntimejitter_ammo));
+/* respawntime */ ATTRIB(VaporizerCells, m_respawntime, float(), GET(instagib_respawntime_ammo));
+/*             */ ATTRIB(VaporizerCells, m_respawntimejitter, float(), GET(instagib_respawntimejitter_ammo));
 /* iteminit    */ ATTRIB(VaporizerCells, m_iteminit, void(Pickup this, entity item), ammo_vaporizercells_init);
 #endif
 ENDCLASS(VaporizerCells)