X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fsandbox%2Fsv_sandbox.qc;h=a387af90f1d58f2d6b098a279603e7e9c2e6c279;hb=f963d587753ce1f8e48c8bf87b0bf860732986be;hp=9458189fd0ed20a448b9da906b3f654c12632452;hpb=8f4e38f34794f44d2ea707ca4b836d88b0a39c3d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
index 9458189fd..a387af90f 100644
--- a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
+++ b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
@@ -1,5 +1,7 @@
 #include "sv_sandbox.qh"
 
+#include <server/intermission.qh>
+
 string autocvar_g_sandbox;
 int autocvar_g_sandbox_info;
 bool autocvar_g_sandbox_readonly;
@@ -16,6 +18,7 @@ float autocvar_g_sandbox_object_scale_max;
 float autocvar_g_sandbox_object_material_velocity_min;
 float autocvar_g_sandbox_object_material_velocity_factor;
 
+IntrusiveList g_sandbox_objects;
 float autosave_time;
 void sandbox_Database_Load();
 
@@ -23,6 +26,7 @@ REGISTER_MUTATOR(sandbox, expr_evaluate(autocvar_g_sandbox))
 {
 	MUTATOR_ONADD
 	{
+		g_sandbox_objects = IL_NEW();
 		autosave_time = time + autocvar_g_sandbox_storage_autosave; // don't save the first server frame
 		if(autocvar_g_sandbox_storage_autoload)
 			sandbox_Database_Load();
@@ -118,7 +122,8 @@ void sandbox_ObjectEdit_Scale(entity e, float f)
 	{
 		e.scale = bound(autocvar_g_sandbox_object_scale_min, e.scale, autocvar_g_sandbox_object_scale_max);
 		_setmodel(e, e.model); // reset mins and maxs based on mesh
-		setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
+		// apply object scaling and prevent any float precision issues like #2742
+		setsize(e, RoundPerfectVector(e.mins * e.scale), RoundPerfectVector(e.maxs * e.scale));
 	}
 }
 
@@ -181,7 +186,7 @@ entity sandbox_ObjectSpawn(entity this, float database)
 	if(!database)
 	{
 		// set the object's owner via player UID
-		// if the player does not have an UID, the owner cannot be stored and his objects may be edited by anyone
+		// if the player does not have an UID, the owner cannot be stored and their objects may be edited by anyone
 		if(this.crypto_idfp != "")
 			e.crypto_idfp = strzone(this.crypto_idfp);
 		else
@@ -432,7 +437,7 @@ void sandbox_Database_Load()
 			if(e.material)
 			{
 				// since objects are being loaded for the first time, precache material sounds for each
-				for (i = 1; i <= 5; i++) // 5 sounds in total
+				for (i = 1; i <= 5; ++i) // 5 sounds in total
 					precache_sound(strcat("object/impact_", e.material, "_", ftos(i), ".wav"));
 			}
 		}
@@ -493,7 +498,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 				print_to(player, "^3physics value ^7- object physics, 0 = static, 1 = movable, 2 = physical");
 				print_to(player, "^3force value ^7- amount of force applied to objects that are shot");
 				print_to(player, "^3material value ^7- sets the material of the object. Default materials are: metal, stone, wood, flesh");
-				print_to(player, "^7\"^2object_claim^7\" sets the player as the owner of the object, if he has the right to edit it");
+				print_to(player, "^7\"^2object_claim^7\" sets the player as the owner of the object, if they have the right to edit it");
 				print_to(player, "^7\"^2object_info ^3value^7\" shows public information about the object");
 				print_to(player, "^3object ^7- prints general information about the object, such as owner and creation / editing date");
 				print_to(player, "^3mesh ^7- prints information about the object's mesh, including skeletal bones");
@@ -709,7 +714,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 							strfree(e.material);
 							if(argv(3))
 							{
-								for (j = 1; j <= 5; j++) // precache material sounds, 5 in total
+								for (j = 1; j <= 5; ++j) // precache material sounds, 5 in total
 									precache_sound(strcat("object/impact_", argv(3), "_", ftos(j), ".wav"));
 								e.material = strzone(argv(3));
 							}
@@ -745,7 +750,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 				{
 					// update the owner's name
 					// Do this before checking if you're already the owner and skipping if such, so we
-					// also update the player's nickname if he changed it (but has the same player UID)
+					// also update the player's nickname if they changed it (but has the same player UID)
 					if(e.netname != player.netname)
 					{
 						strcpy(e.netname, player.netname);