r4657 - in branches/nexuiz-2.0: . data/qcsrc/common data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 8 04:02:09 EDT 2008
Author: div0
Date: 2008-10-08 04:02:07 -0400 (Wed, 08 Oct 2008)
New Revision: 4657
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
Log:
r4654 | div0 | 2008-10-07 20:05:28 +0200 (Tue, 07 Oct 2008) | 2 lines
update world mins/maxs fro mapinfo; fix comment
r4655 | div0 | 2008-10-08 07:28:04 +0200 (Wed, 08 Oct 2008) | 2 lines
new command "sv_cmd bbox" outputting all relevant bboxes of a map (q3map2 written bbox, mapinfo written bbox, solid bbox)
r4656 | div0 | 2008-10-08 09:58:41 +0200 (Wed, 08 Oct 2008) | 2 lines
fix bogus keyhunt interfere messages
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2008-10-08 07:58:41 UTC (rev 4656)
+++ branches/nexuiz-2.0/.patchsets 2008-10-08 08:02:07 UTC (rev 4657)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4652
+revisions_applied = 1-4656
Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2008-10-08 07:58:41 UTC (rev 4656)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2008-10-08 08:02:07 UTC (rev 4657)
@@ -567,7 +567,7 @@
fputs(fh, "// optional: fog density red green blue alpha mindist maxdist\n");
fputs(fh, "// optional: settemp_for_type (all|gametypename) cvarname value\n");
fputs(fh, "// optional: clientsettemp_for_type (all|gametypename) cvarname value\n");
- fputs(fh, "// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z (for team map)\n");
+ fputs(fh, "// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
fclose(fh);
r = 2;
Modified: branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2008-10-08 07:58:41 UTC (rev 4656)
+++ branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2008-10-08 08:02:07 UTC (rev 4657)
@@ -200,6 +200,83 @@
}
}
+void BBox()
+{
+ print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z));
+ print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n");
+ print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z));
+ print(" ", ftos(world.maxs_x), " ", ftos(world.maxs_y), " ", ftos(world.maxs_z), "\n");
+ print("Solid bounding box size:");
+
+ 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,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmin_x));
+ else
+ print(" ", ftos(trace_endpos_x));
+
+ tracebox('0 1 0' * world.absmin_y,
+ '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
+ '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
+ '0 1 0' * world.absmax_y,
+ MOVE_WORLDONLY,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmin_y));
+ else
+ print(" ", ftos(trace_endpos_y));
+
+ tracebox('0 0 1' * world.absmin_z,
+ '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
+ '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
+ '0 0 1' * world.absmax_z,
+ MOVE_WORLDONLY,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmin_z));
+ else
+ print(" ", ftos(trace_endpos_z));
+
+ tracebox('1 0 0' * world.absmax_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.absmin_x,
+ MOVE_WORLDONLY,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmax_x));
+ else
+ print(" ", ftos(trace_endpos_x));
+
+ tracebox('0 1 0' * world.absmax_y,
+ '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
+ '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
+ '0 1 0' * world.absmin_y,
+ MOVE_WORLDONLY,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmax_y));
+ else
+ print(" ", ftos(trace_endpos_y));
+
+ tracebox('0 0 1' * world.absmax_z,
+ '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
+ '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
+ '0 0 1' * world.absmin_z,
+ MOVE_WORLDONLY,
+ world);
+ if(trace_startsolid)
+ print(" ", ftos(world.absmax_z));
+ else
+ print(" ", ftos(trace_endpos_z));
+
+ print("\n");
+}
+
void EffectIndexDump()
{
float d;
@@ -300,6 +377,7 @@
print(" allready\n");
print(" effectindexdump\n");
print(" roughmap\n");
+ print(" bbox\n");
GameCommand_Vote("help", world);
GameCommand_Ban("help");
GameCommand_Generic("help");
@@ -487,6 +565,11 @@
RoughMap(argc);
return;
}
+ if (argv(0) == "bbox")
+ {
+ BBox();
+ return;
+ }
if (argv(0) == "cvar_changes")
{
print(cvar_changes);
Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2008-10-08 07:58:41 UTC (rev 4656)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2008-10-08 08:02:07 UTC (rev 4657)
@@ -344,6 +344,8 @@
}
else
{
+ kh_interferemsg_time = 0;
+
// audit all key carrier sprites, update them to RUN HERE
FOR_EACH_KH_KEY(k)
{
@@ -452,8 +454,10 @@
{
entity key;
float teem;
+ float keys;
teem = -1;
+ keys = kh_teams;
FOR_EACH_KH_KEY(key)
{
if(!key.owner)
@@ -462,7 +466,10 @@
teem = key.team;
else if(teem != key.team)
return -1;
+ --keys;
}
+ if(keys != 0)
+ return -1;
return teem;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2008-10-08 07:58:41 UTC (rev 4656)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2008-10-08 08:02:07 UTC (rev 4657)
@@ -173,6 +173,11 @@
WriteGameCvars();
MapInfo_LoadMapSettings(mapname);
+ if(MapInfo_Map_mins_x < MapInfo_Map_maxs_x)
+ {
+ world.mins = MapInfo_Map_mins;
+ world.maxs = MapInfo_Map_maxs;
+ }
if not(cvar_value_issafe(world.fog))
{
print("The current map contains a potentially harmful fog setting, ignored\n");
More information about the nexuiz-commits
mailing list