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 73bb60536c110058e20360b1f8d63cfe508e0a34..2aad3f3bff832748b72220f136cca69c120b94d2 100644 (file)
--- a/qcsrc/common/mapobjects/func/fourier.qc
+++ b/qcsrc/common/mapobjects/func/fourier.qc
@@ -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);