]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Begin messing around with contents transition
authorSamual Lenks <samual@xonotic.org>
Tue, 24 Dec 2013 02:47:05 +0000 (21:47 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 24 Dec 2013 02:47:05 +0000 (21:47 -0500)
qcsrc/client/movetypes.qc
qcsrc/server/w_grenadelauncher.qc

index 22bbd142f90871ad4d8c906eda836d489dca761d..254362aca746837b10836aad9a0a49853a1ad957 100644 (file)
@@ -17,6 +17,7 @@ float _Movetype_CheckWater() // SV_CheckWater
 
 void _Movetype_CheckWaterTransition() // SV_CheckWaterTransition
 {
+       print("foobar\n");
 }
 
 void _Movetype_Impact(entity oth) // SV_Impact
index 17144d3a53028d2f07ea61751d7f337c19e4e5b4..47f6b590989d4309d4dbf0ba4963d40091bbcfb8 100644 (file)
@@ -175,6 +175,13 @@ void W_Grenade_Touch2 (void)
        }
 }
 
+void W_Grenade_ContentsTransition(float originalcont, float newcont)
+{
+       //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), self.origin, self.velocity, 1);
+       pointparticles(particleeffectnum("grenade_explode"), self.origin, '0 0 0', 1);
+       print(sprintf("W_Grenade_ContentsTransition(): Original: '%d', New: '%d'\n", originalcont, newcont));
+}
+
 void W_Grenade_Attack (void)
 {
        entity gren;
@@ -210,6 +217,7 @@ void W_Grenade_Attack (void)
        gren.damageforcescale = autocvar_g_balance_grenadelauncher_primary_damageforcescale;
        gren.event_damage = W_Grenade_Damage;
        gren.damagedbycontents = TRUE;
+       gren.contentstransition = W_Grenade_ContentsTransition;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
        W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_primary);