Merge branch 'bones_was_here/q3compat' into 'master'

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

diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc
index 05fafa4f026dc0ab881e12a28b6a87ca911dbfed..d3c042ef93dae155463cfff3f6b012803b88f799 100644 (file)
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@ -653,12 +653,25 @@ void door_init_shared(entity this)
        }
 
        // TODO: other soundpacks
        }
 
        // TODO: other soundpacks

-       if (this.sounds > 0)
+       if (this.sounds > 0 || q3compat)

        {
        {

+               // Doors in Q3 always have sounds (they're hard coded in Q3 engine)

                this.noise2 = "plats/medplat1.wav";
                this.noise1 = "plats/medplat2.wav";
        }
 
                this.noise2 = "plats/medplat1.wav";
                this.noise1 = "plats/medplat2.wav";
        }
 

+       if (q3compat)
+       {
+               // CPMA adds these fields for overriding the engine sounds
+               string s = GetField_fullspawndata(this, "sound_start", true);
+               string e = GetField_fullspawndata(this, "sound_end", true);
+
+               if (s)
+                       this.noise2 = strzone(s);
+               if (e)
+                       this.noise1 = strzone(e);
+       }
+

        // sound when door stops moving
        if(this.noise1 && this.noise1 != "")
        {
        // sound when door stops moving
        if(this.noise1 && this.noise1 != "")
        {


@@ -737,7 +750,7 @@ spawnfunc(func_door)
         }
         else if (!this.speed)
         {
         }
         else if (!this.speed)
         {

-               if (autocvar_sv_q3defragcompat)
+               if (q3compat)

                        this.speed = 400;
                else
                        this.speed = 100;
                        this.speed = 400;
                else
                        this.speed = 100;