Merge branch 'master' into Mario/status_effects_extended

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / func / fourier.qc

diff --git a/qcsrc/common/mapobjects/func/fourier.qc b/qcsrc/common/mapobjects/func/fourier.qc
index 28e0f0f7c74df039f84a7f2d111ca32a634f0844..2aad3f3bff832748b72220f136cca69c120b94d2 100644 (file)
--- a/qcsrc/common/mapobjects/func/fourier.qc
+++ b/qcsrc/common/mapobjects/func/fourier.qc
@@ -46,7 +46,7 @@ spawnfunc(func_fourier)
        if (this.noise != "")
        {
                precache_sound(this.noise);
-               soundto(MSG_INIT, this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE);
+               soundto(MSG_INIT, this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE, 0);
        }
 
        if (!this.speed)
@@ -59,7 +59,7 @@ spawnfunc(func_fourier)
        setblocked(this, generic_plat_blocked);
        if(this.dmg && (this.message == ""))
                this.message = " was squished";
-    if(this.dmg && (this.message2 == ""))
+       if(this.dmg && (this.message2 == ""))
                this.message2 = "was squished by";
        if(this.dmg && (!this.dmgtime))
                this.dmgtime = 0.25;
@@ -74,7 +74,7 @@ spawnfunc(func_fourier)
        this.active = ACTIVE_ACTIVE;
 
        // wait for targets to spawn
-       controller = new(func_fourier_controller);
+       controller = new_pure(func_fourier_controller);
        controller.owner = this;
        controller.nextthink = time + 1;
        setthink(controller, func_fourier_controller_think);