X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=a077b213a00b6b60f21a7f7844273843ea7f626b;hb=3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5;hp=391e317423dffd4dd37e628effe9a988b452267f;hpb=582d4772020ad581b8a76d372dd9f5f1ed8a756f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 391e31742..a077b213a 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -20,13 +20,13 @@ void sandbox_ObjectFunction_Touch()
 	intensity = vlen(self.velocity) + vlen(other.velocity);
 	if(intensity) // avoid divisions by 0
 		intensity /= 2; // average the two velocities
-	if not(intensity >= autocvar_g_sandbox_object_material_velocity_min)
+	if (!(intensity >= autocvar_g_sandbox_object_material_velocity_min))
 		return; // impact not strong enough to do anything
 	// now offset intensity and apply it to the effects
 	intensity -= autocvar_g_sandbox_object_material_velocity_min; // start from minimum velocity, not actual velocity
 	intensity = bound(0, intensity * autocvar_g_sandbox_object_material_velocity_factor, 1);
 
-	sound(self, CH_TRIGGER, strcat("object/impact_", self.material, "_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM);
+	sound(self, CH_TRIGGER, strcat("object/impact_", self.material, "_", ftos(ceil(random() * 5)) , ".wav"), VOL_BASE * intensity, ATTEN_NORM);
 	pointparticles(particleeffectnum(strcat("impact_", self.material)), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10
 }
 
@@ -72,9 +72,9 @@ entity sandbox_ObjectEdit_Get(float permissions)
 		return world; // entity is not an object
 	if(!permissions)
 		return trace_ent; // don't check permissions, anyone can edit this object
-	if(!trace_ent.crypto_idfp)
+	if(trace_ent.crypto_idfp == "")
 		return trace_ent; // the player who spawned this object did not have an UID, so anyone can edit it
-	if not(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2)
+	if (!(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2))
 		return trace_ent; // object does not belong to the player, and players can only edit their own objects on this server
 	return world;
 }
@@ -389,7 +389,7 @@ void sandbox_Database_Load()
 		for(;;)
 		{
 			file_read = fgets(file_get);
-			if(!file_read)
+			if(file_read == "")
 				break;
 			if(substring(file_read, 0, 2) == "//")
 				continue;
@@ -403,7 +403,7 @@ void sandbox_Database_Load()
 			{
 				// since objects are being loaded for the first time, precache material sounds for each
 				for (i = 1; i <= 5; i++) // 5 sounds in total
-					precache_sound(strcat("object/impact_", e.material, "_", ftos(i), ".ogg"));
+					precache_sound(strcat("object/impact_", e.material, "_", ftos(i), ".wav"));
 			}
 		}
 		if(autocvar_g_sandbox_info > 0)
@@ -484,7 +484,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'object_spawn' command");
 					return TRUE;
 				}
-				if not(fexists(argv(2)))
+				if (!(fexists(argv(2))))
 				{
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct");
 					return TRUE;
@@ -538,7 +538,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							return TRUE;
 						}
 						self.object_flood = time + autocvar_g_sandbox_editor_flood;
-						if(!argv(3)) // no object in clipboard
+						if(argv(3) == "") // no object in clipboard
 						{
 							print_to(self, "^1SANDBOX - WARNING: ^7No object in clipboard. You must copy an object before you can paste it");
 							return TRUE;
@@ -610,7 +610,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 
 			// ---------------- COMMAND: OBJECT, EDIT ----------------
 			case "object_edit":
-				if(!argv(2))
+				if(argv(2) == "")
 				{
 					print_to(self, "^1SANDBOX - WARNING: ^7Too few parameters. You must specify a property to edit");
 					return TRUE;
@@ -675,7 +675,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							if(argv(3))
 							{
 								for (i = 1; i <= 5; i++) // precache material sounds, 5 in total
-									precache_sound(strcat("object/impact_", argv(3), "_", ftos(i), ".ogg"));
+									precache_sound(strcat("object/impact_", argv(3), "_", ftos(i), ".wav"));
 								e.material = strzone(argv(3));
 							}
 							else