X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=4d181c4659d7dca887f99ca1c1c6f888911b7781;hb=e435344ae1d6288dde08dc931f1e1b48547218ce;hp=c403e28f1b4263ed1e5f966e840a482956fdba79;hpb=12700950f6fdaf354a4a8aafa85dc87c9b62331a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index c403e28f1..4d181c465 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -251,20 +251,15 @@ void GameCommand_bbox(float request)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			LOG_INFO("Original size: ", ftos(world.absmin.x), " ", ftos(world.absmin.y), " ", ftos(world.absmin.z));
-			LOG_INFO(" ", ftos(world.absmax.x), " ", ftos(world.absmax.y), " ", ftos(world.absmax.z), "\n");
-			LOG_INFO("Currently set size: ", ftos(world.mins.x), " ", ftos(world.mins.y), " ", ftos(world.mins.z));
-			LOG_INFO(" ", ftos(world.maxs.x), " ", ftos(world.maxs.y), " ", ftos(world.maxs.z), "\n");
-			LOG_INFO("Solid bounding box size:");
-
+			vector size_min = '0 0 0';
+			vector size_max = '0 0 0';
 			tracebox('1 0 0' * world.absmin.x,
 				'0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z,
 				'0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z,
 				'1 0 0' * world.absmax.x,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.x));
-			else LOG_INFO(" ", ftos(trace_endpos.x));
+			size_min.x = (trace_startsolid) ? world.absmin.x : trace_endpos.x;
 
 			tracebox('0 1 0' * world.absmin.y,
 				'1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z,
@@ -272,8 +267,7 @@ void GameCommand_bbox(float request)
 				'0 1 0' * world.absmax.y,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.y));
-			else LOG_INFO(" ", ftos(trace_endpos.y));
+			size_min.y = (trace_startsolid) ? world.absmin.y : trace_endpos.y;
 
 			tracebox('0 0 1' * world.absmin.z,
 				'1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y,
@@ -281,8 +275,7 @@ void GameCommand_bbox(float request)
 				'0 0 1' * world.absmax.z,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.z));
-			else LOG_INFO(" ", ftos(trace_endpos.z));
+			size_min.z = (trace_startsolid) ? world.absmin.z : trace_endpos.z;
 
 			tracebox('1 0 0' * world.absmax.x,
 				'0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z,
@@ -290,8 +283,7 @@ void GameCommand_bbox(float request)
 				'1 0 0' * world.absmin.x,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.x));
-			else LOG_INFO(" ", ftos(trace_endpos.x));
+			size_max.x = (trace_startsolid) ? world.absmax.x : trace_endpos.x;
 
 			tracebox('0 1 0' * world.absmax.y,
 				'1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z,
@@ -299,8 +291,7 @@ void GameCommand_bbox(float request)
 				'0 1 0' * world.absmin.y,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.y));
-			else LOG_INFO(" ", ftos(trace_endpos.y));
+			size_max.y = (trace_startsolid) ? world.absmax.y : trace_endpos.y;
 
 			tracebox('0 0 1' * world.absmax.z,
 				'1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y,
@@ -308,10 +299,11 @@ void GameCommand_bbox(float request)
 				'0 0 1' * world.absmin.z,
 				MOVE_WORLDONLY,
 				NULL);
-			if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.z));
-			else LOG_INFO(" ", ftos(trace_endpos.z));
+			size_max.z = (trace_startsolid) ? world.absmax.z : trace_endpos.z;
 
-			LOG_INFO("\n");
+			LOG_INFOF("Original size: %v %v\n", world.absmin, world.absmax);
+			LOG_INFOF("Currently set size: %v %v\n", world.mins, world.maxs);
+			LOG_INFOF("Solid bounding box size: %v %v\n", size_min, size_max);
 			return;
 		}
 
@@ -1152,7 +1144,7 @@ void GameCommand_nospectators(float request)
 			FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)) && !it.caplayer, LAMBDA(
 				if(!it.caplayer)
 				{
-					it.spectatortime = time;
+					CS(it).spectatortime = time;
 					Send_Notification(NOTIF_ONE_ONLY, it, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);
 				}
 			));