X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=94ba20f10d8320b07f4b1d18e0232cb6dd04bf4d;hb=1ea3b0365fd6fbb31c38cf6d22ee0b952e9010c1;hp=cf5d82f87ae4ecf141afd7d80dbbb31af2a07e43;hpb=30e9db455abe691a3560555a989beb382b3b2531;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index cf5d82f87..94ba20f10 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -26,7 +26,7 @@ void sandbox_ObjectFunction_Touch() 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)) , ".wav"), 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,7 +72,7 @@ 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) return trace_ent; // object does not belong to the player, and players can only edit their own objects on this server @@ -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; @@ -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;