Final cleanup for now

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index ad6279d366bda6f126cd5a69210daf9899f3d8de..6c5d0ebd056ea4c494f425395560078d54d733e4 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -59,6 +59,7 @@ float _Movetype_CheckWater(entity ent) // SV_CheckWater
        if(ent.move_watertype)
        if(ent.move_watertype != nativecontents)
        {
+               //print(sprintf("_Movetype_CheckWater(): Original: '%d', New: '%d'\n", ent.move_watertype, nativecontents));
                if(ent.contentstransition)
                        ent.contentstransition(ent.move_watertype, nativecontents);
        }
@@ -100,6 +101,7 @@ void _Movetype_CheckWaterTransition(entity ent) // SV_CheckWaterTransition
        }
        else if(ent.move_watertype != contents)
        {
+               //print(sprintf("_Movetype_CheckWaterTransition(): Origin: %s, Direct: '%d', Original: '%d', New: '%d'\n", vtos(ent.move_origin), pointcontents(ent.move_origin), ent.move_watertype, contents));
                if(ent.contentstransition)
                        ent.contentstransition(ent.move_watertype, contents);
        }

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 47f6b590989d4309d4dbf0ba4963d40091bbcfb8..17144d3a53028d2f07ea61751d7f337c19e4e5b4 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -175,13 +175,6 @@ 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;
@@ -217,7 +210,6 @@ 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);