]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/weapons/weapon/devastator.qc
Weapons: remove WEP_ACTION
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / devastator.qc
index 9a235bf35d5206b4d5d8fe049aa355d85ad5a50c..2204548b232537019e49160cf48ff18b0fda0430 100644 (file)
@@ -1,19 +1,21 @@
 #ifndef IMPLEMENTATION
-REGISTER_WEAPON(
-/* WEP_##id  */ DEVASTATOR,
-/* function  */ W_Devastator,
-/* ammotype  */ ammo_rockets,
-/* impulse   */ 9,
-/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
-/* rating    */ BOT_PICKUP_RATING_HIGH,
-/* color     */ '1 1 0',
-/* modelname */ "rl",
-/* simplemdl */ "foobar",
-/* crosshair */ "gfx/crosshairrocketlauncher 0.7",
-/* wepimg    */ "weaponrocketlauncher",
-/* refname   */ "devastator",
-/* wepname   */ _("Devastator")
-);
+CLASS(Devastator, Weapon)
+/* ammotype  */ ATTRIB(Devastator, ammo_field, .int, ammo_rockets)
+/* impulse   */ ATTRIB(Devastator, impulse, int, 9)
+/* flags     */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
+/* rating    */ ATTRIB(Devastator, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
+/* color     */ ATTRIB(Devastator, wpcolor, vector, '1 1 0');
+/* modelname */ ATTRIB(Devastator, mdl, string, "rl");
+#ifndef MENUQC
+/* model     */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM);
+#endif
+/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairrocketlauncher");
+/* crosshair */ ATTRIB(Devastator, w_crosshair_size, float, 0.7);
+/* wepimg    */ ATTRIB(Devastator, model2, string, "weaponrocketlauncher");
+/* refname   */ ATTRIB(Devastator, netname, string, "devastator");
+/* wepname   */ ATTRIB(Devastator, message, string, _("Devastator"));
+ENDCLASS(Devastator)
+REGISTER_WEAPON(DEVASTATOR, NEW(Devastator));
 
 #define DEVASTATOR_SETTINGS(w_cvar,w_prop) DEVASTATOR_SETTINGS_LIST(w_cvar, w_prop, DEVASTATOR, devastator)
 #define DEVASTATOR_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
@@ -66,7 +68,7 @@ void spawnfunc_weapon_devastator(void) { weapon_defaultspawnfunc(WEP_DEVASTATOR.
 void spawnfunc_weapon_rocketlauncher(void) { spawnfunc_weapon_devastator(); }
 
 void W_Devastator_Unregister(void)
-{
+{SELFPARAM();
        if(self.realowner && self.realowner.lastrocket == self)
        {
                self.realowner.lastrocket = world;
@@ -75,7 +77,7 @@ void W_Devastator_Unregister(void)
 }
 
 void W_Devastator_Explode(void)
-{
+{SELFPARAM();
        W_Devastator_Unregister();
 
        if(other.takedamage == DAMAGE_AIM)
@@ -115,7 +117,7 @@ void W_Devastator_Explode(void)
 }
 
 void W_Devastator_DoRemoteExplode(void)
-{
+{SELFPARAM();
        W_Devastator_Unregister();
 
        self.event_damage = func_null;
@@ -194,7 +196,7 @@ void W_Devastator_DoRemoteExplode(void)
 }
 
 void W_Devastator_RemoteExplode(void)
-{
+{SELFPARAM();
        if(self.realowner.deadflag == DEAD_NO)
        if(self.realowner.lastrocket)
        {
@@ -242,7 +244,7 @@ vector W_Devastator_SteerTo(vector thisdir, vector goaldir, float maxturn_cos)
 //   normalize(0)
 
 void W_Devastator_Think(void)
-{
+{SELFPARAM();
        vector desireddir, olddir, newdir, desiredorigin, goal;
        float velspeed, f;
        self.nextthink = time;
@@ -295,7 +297,7 @@ void W_Devastator_Think(void)
                        {
                                Send_Effect(EFFECT_ROCKET_GUIDE, self.origin, self.velocity, 1);
                                // TODO add a better sound here
-                               sound(self.realowner, CH_WEAPON_B, W_Sound("rocket_mode"), VOL_BASE, ATTN_NORM);
+                               sound(self.realowner, CH_WEAPON_B, SND_ROCKET_MODE, VOL_BASE, ATTN_NORM);
                                self.count = 1;
                        }
                }
@@ -309,7 +311,7 @@ void W_Devastator_Think(void)
 }
 
 void W_Devastator_Touch(void)
-{
+{SELFPARAM();
        if(WarpZone_Projectile_Touch())
        {
                if(wasfreed(self))
@@ -321,7 +323,7 @@ void W_Devastator_Touch(void)
 }
 
 void W_Devastator_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
        if(self.health <= 0)
                return;
 
@@ -335,14 +337,14 @@ void W_Devastator_Damage(entity inflictor, entity attacker, float damage, int de
                W_PrepareExplosionByDamage(attacker, W_Devastator_Explode);
 }
 
-void W_Devastator_Attack(void)
-{
+void W_Devastator_Attack(Weapon thiswep)
+{SELFPARAM();
        entity missile;
        entity flash;
 
-       W_DecreaseAmmo(WEP_CVAR(devastator, ammo));
+       W_DecreaseAmmo(thiswep, WEP_CVAR(devastator, ammo));
 
-       W_SetupShot_ProjectileSize(self, '-3 -3 -3', '3 3 3', false, 5, W_Sound("rocket_fire"), CH_WEAPON_A, WEP_CVAR(devastator, damage));
+       W_SetupShot_ProjectileSize(self, '-3 -3 -3', '3 3 3', false, 5, SND(ROCKET_FIRE), CH_WEAPON_A, WEP_CVAR(devastator, damage));
        Send_Effect(EFFECT_ROCKET_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1);
 
        missile = WarpZone_RefSys_SpawnSameRefSys(self);
@@ -383,7 +385,7 @@ void W_Devastator_Attack(void)
 
        // muzzle flash for 1st person view
        flash = spawn();
-       setmodel(flash, "models/flash.md3"); // precision set below
+       setmodel(flash, MDL_DEVASTATOR_MUZZLEFLASH); // precision set below
        SUB_SetFade(flash, time, 0.1);
        flash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
        W_AttachToShotorg(flash, '5 0 0');
@@ -392,15 +394,8 @@ void W_Devastator_Attack(void)
        MUTATOR_CALLHOOK(EditProjectile, self, missile);
 }
 
-bool W_Devastator(int req)
-{
-       entity rock;
-       float rockfound;
-       float ammo_amount;
-       switch(req)
-       {
                #if 0
-               case WR_AIM:
+               METHOD(Devastator, wr_aim, bool(entity thiswep))
                {
                        // aim and decide to fire if appropriate
                        self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), false);
@@ -429,7 +424,7 @@ bool W_Devastator(int req)
                        return true;
                }
                #else
-               case WR_AIM:
+               METHOD(Devastator, wr_aim, bool(entity thiswep))
                {
                        // aim and decide to fire if appropriate
                        self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), false);
@@ -527,18 +522,19 @@ bool W_Devastator(int req)
                        return true;
                }
                #endif
-               case WR_THINK:
+               METHOD(Devastator, wr_think, bool(entity thiswep, bool fire1, bool fire2))
                {
-                       if(WEP_CVAR(devastator, reload_ammo) && self.clip_load < WEP_CVAR(devastator, ammo)) // forced reload
-                               WEP_ACTION(self.weapon, WR_RELOAD);
-                       else
+                       if(WEP_CVAR(devastator, reload_ammo) && self.clip_load < WEP_CVAR(devastator, ammo)) { // forced reload
+                               Weapon w = get_weaponinfo(self.weapon);
+                               w.wr_reload(w);
+                       } else
                        {
-                               if(self.BUTTON_ATCK)
+                               if(fire1)
                                {
                                        if(self.rl_release || WEP_CVAR(devastator, guidestop))
-                                       if(weapon_prepareattack(0, WEP_CVAR(devastator, refire)))
+                                       if(weapon_prepareattack(false, WEP_CVAR(devastator, refire)))
                                        {
-                                               W_Devastator_Attack();
+                                               W_Devastator_Attack(thiswep);
                                                weapon_thinkf(WFRAME_FIRE1, WEP_CVAR(devastator, animtime), w_ready);
                                                self.rl_release = 0;
                                        }
@@ -546,46 +542,37 @@ bool W_Devastator(int req)
                                else
                                        self.rl_release = 1;
 
-                               if(self.BUTTON_ATCK2)
+                               if(fire2)
                                if(self.switchweapon == WEP_DEVASTATOR.m_id)
                                {
-                                       rockfound = 0;
+                                       entity rock;
+                                       bool rockfound = false;
                                        for(rock = world; (rock = find(rock, classname, "rocket")); ) if(rock.realowner == self)
                                        {
                                                if(!rock.rl_detonate_later)
                                                {
                                                        rock.rl_detonate_later = true;
-                                                       rockfound = 1;
+                                                       rockfound = true;
                                                }
                                        }
                                        if(rockfound)
-                                               sound(self, CH_WEAPON_B, W_Sound("rocket_det"), VOL_BASE, ATTN_NORM);
+                                               sound(self, CH_WEAPON_B, SND_ROCKET_DET, VOL_BASE, ATTN_NORM);
                                }
                        }
 
                        return true;
                }
-               case WR_INIT:
+               METHOD(Devastator, wr_init, bool(entity thiswep))
                {
-                       //if(autocvar_sv_precacheweapons)
-                       //{
-                               precache_model("models/flash.md3");
-                               precache_model(W_Model("g_rl.md3"));
-                               precache_model(W_Model("v_rl.md3"));
-                               precache_model(W_Model("h_rl.iqm"));
-                               precache_sound(W_Sound("rocket_det"));
-                               precache_sound(W_Sound("rocket_fire"));
-                               precache_sound(W_Sound("rocket_mode"));
-                       //}
                        DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
-               case WR_SETUP:
+               METHOD(Devastator, wr_setup, bool(entity thiswep))
                {
                        self.rl_release = 1;
                        return true;
                }
-               case WR_CHECKAMMO1:
+               METHOD(Devastator, wr_checkammo1, bool(entity thiswep))
                {
                        #if 0
                        // don't switch while guiding a missile
@@ -616,72 +603,64 @@ bool W_Devastator(int req)
                                return ammo_amount;
                        }
                        #else
-                       ammo_amount = self.WEP_AMMO(DEVASTATOR) >= WEP_CVAR(devastator, ammo);
+                       float ammo_amount = self.WEP_AMMO(DEVASTATOR) >= WEP_CVAR(devastator, ammo);
                        ammo_amount += self.(weapon_load[WEP_DEVASTATOR.m_id]) >= WEP_CVAR(devastator, ammo);
                        return ammo_amount;
                        #endif
                }
-               case WR_CHECKAMMO2:
+               METHOD(Devastator, wr_checkammo2, bool(entity thiswep))
                {
                        return false;
                }
-               case WR_CONFIG:
+               METHOD(Devastator, wr_config, bool(entity thiswep))
                {
                        DEVASTATOR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
-               case WR_RESETPLAYER:
+               METHOD(Devastator, wr_resetplayer, bool(entity thiswep))
                {
                        self.rl_release = 0;
                        return true;
                }
-               case WR_RELOAD:
+               METHOD(Devastator, wr_reload, bool(entity thiswep))
                {
-                       W_Reload(WEP_CVAR(devastator, ammo), W_Sound("reload"));
+                       W_Reload(WEP_CVAR(devastator, ammo), SND(RELOAD));
                        return true;
                }
-               case WR_SUICIDEMESSAGE:
+               METHOD(Devastator, wr_suicidemessage, bool(entity thiswep))
                {
                        return WEAPON_DEVASTATOR_SUICIDE;
                }
-               case WR_KILLMESSAGE:
+               METHOD(Devastator, wr_killmessage, bool(entity thiswep))
                {
                        if((w_deathtype & HITTYPE_BOUNCE) || (w_deathtype & HITTYPE_SPLASH))
                                return WEAPON_DEVASTATOR_MURDER_SPLASH;
                        else
                                return WEAPON_DEVASTATOR_MURDER_DIRECT;
                }
-       }
-       return false;
-}
+
 #endif
 #ifdef CSQC
-bool W_Devastator(int req)
-{
-       switch(req)
-       {
-               case WR_IMPACTEFFECT:
+
+               METHOD(Devastator, wr_impacteffect, bool(entity thiswep))
                {
                        vector org2;
                        org2 = w_org + w_backoff * 12;
                        pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), org2, '0 0 0', 1);
                        if(!w_issilent)
-                               sound(self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTN_NORM);
+                               sound(self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTN_NORM);
 
                        return true;
                }
-               case WR_INIT:
+               METHOD(Devastator, wr_init, bool(entity thiswep))
                {
-                       precache_sound(W_Sound("rocket_impact"));
                        return true;
                }
-               case WR_ZOOMRETICLE:
+               METHOD(Devastator, wr_zoomreticle, bool(entity thiswep))
                {
                        // no weapon specific image for this weapon
                        return false;
                }
-       }
-       return false;
-}
+
 #endif
 #endif