Rename "shortname" to "netname", the field is called netname anyway

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_hagar.qc

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 96277ef240dc9f5a3bbcbe8dc68ab1ff915146e9..a28daff80fa9ea5e59e3c693f78179b89587e050 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -1,14 +1,14 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(
-/* WEP_##id  */ HAGAR,
-/* function  */ w_hagar,
-/* ammotype  */ IT_ROCKETS,
-/* impulse   */ 8,
-/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
-/* rating    */ BOT_PICKUP_RATING_MID,
-/* model     */ "hagar",
-/* shortname */ "hagar",
-/* fullname  */ _("Hagar")
+/* WEP_##id */ HAGAR,
+/* function */ w_hagar,
+/* ammotype */ IT_ROCKETS,
+/* impulse  */ 8,
+/* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
+/* rating   */ BOT_PICKUP_RATING_MID,
+/* model    */ "hagar",
+/* netname  */ "hagar",
+/* fullname */ _("Hagar")
 );
 
 #define HAGAR_SETTINGS(weapon) \
@@ -435,7 +435,7 @@ float w_hagar(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_model ("models/weapons/g_hagar.md3");
                        precache_model ("models/weapons/v_hagar.md3");
@@ -476,6 +476,15 @@ float w_hagar(float req)
                        ammo_amount += self.(weapon_load[WEP_HAGAR]) >= WEP_CVAR_SEC(hagar, ammo);
                        return ammo_amount;
                }
+               case WR_CONFIG:
+               {
+                       #define WEP_ADD_CVAR(weapon,mode,name) WEP_CONFIG_WRITE_CVARS(weapon,mode,name)
+                       #define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,prop,name)
+                       HAGAR_SETTINGS(hagar)
+                       #undef WEP_ADD_CVAR
+                       #undef WEP_ADD_PROP
+                       return TRUE;
+               }
                case WR_RESETPLAYER:
                {
                        self.hagar_load = 0;
@@ -533,7 +542,7 @@ float w_hagar(float req)
                        
                        return TRUE;
                }
-               case WR_PRECACHE:
+               case WR_INIT:
                {
                        precache_sound("weapons/hagexp1.wav");
                        precache_sound("weapons/hagexp2.wav");