X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ffunc%2Fdoor.qc;h=e9fd04b7263398217e507800c47261f50ab29696;hp=aa5b54a60ed4ba7ce22dbd761d2321610f989392;hb=565754a35f9e84a3b8e6eac08635ec27145b369a;hpb=b4101f6e6d27c9820bceba20b3f71cfbbe83c557

diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc
index aa5b54a60..e9fd04b72 100644
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@ -670,10 +670,15 @@ void door_init_shared(entity this)
 		precache_sound(this.noise2);
 	}
 
-	if (!this.wait)
-	{
-		this.wait = 3;
-	}
+        if(autocvar_sv_doors_always_open)
+        {
+                 this.wait = -1;
+        }
+        else if (!this.wait)
+        {
+              	this.wait = 3;
+        }
+
 	if (!this.lip)
 	{
 		this.lip = 8;
@@ -726,10 +731,14 @@ spawnfunc(func_door)
 	this.pos1 = this.origin;
 	this.pos2 = this.pos1 + this.movedir*(fabs(this.movedir*this.size) - this.lip);
 
-	if (!this.speed)
-	{
-		this.speed = 100;
-	}
+        if(autocvar_sv_doors_always_open)
+        {
+                this.speed = max(750, this.speed);
+        }
+        else if (!this.speed)
+        {
+                this.speed = 100;
+        }
 
 	settouch(this, door_touch);