r5173 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Dec 8 05:29:28 EST 2008
Author: div0
Date: 2008-12-08 05:29:26 -0500 (Mon, 08 Dec 2008)
New Revision: 5173
Modified:
trunk/data/ctfscoring-div0.cfg
trunk/data/qcsrc/server/g_world.qc
Log:
update comments
Modified: trunk/data/ctfscoring-div0.cfg
===================================================================
--- trunk/data/ctfscoring-div0.cfg 2008-12-08 07:00:37 UTC (rev 5172)
+++ trunk/data/ctfscoring-div0.cfg 2008-12-08 10:29:26 UTC (rev 5173)
@@ -1,4 +1,5 @@
// Scoring from the democratic poll at http://www.alientrap.org/forum/viewtopic.php?p=49529#49529
+// based on ctfscoring-z, but adjusted to be less harsh
set g_ctf_flagscore_pickup_base -3
set g_ctf_flagscore_pickup_dropped_early 2
@@ -15,7 +16,7 @@
// succeeded capture (pickup capture) 25 (0 for enemy)
// failed capture (pickup kill drop return) -6 (8 for enemy)
-// failed (shot into void) (pickup kill drop) -4 (3 for enemy)
+// failed (shot into void) (pickup kill drop) -5 (3 for enemy)
// capture retry (kill drop pickup) 0 (3 for enemy)
// suicide, then retake (suicidedrop pickup) 0 (0 for enemy)
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2008-12-08 07:00:37 UTC (rev 5172)
+++ trunk/data/qcsrc/server/g_world.qc 2008-12-08 10:29:26 UTC (rev 5173)
@@ -194,6 +194,36 @@
cvar_changes = strzone(cvar_changes);
}
+void detect_maptype()
+{
+ vector o, v;
+ float i;
+
+ for(;;)
+ {
+ o = world.mins;
+ o_x += random() * (world.maxs_x - world.mins_x);
+ o_y += random() * (world.maxs_y - world.mins_y);
+ o_z += random() * (world.maxs_z - world.mins_z);
+
+ tracebox(o, PL_MIN, PL_MAX, o - '0 0 32768', MOVE_WORLDONLY, world);
+ if(trace_fraction == 1)
+ continue;
+
+ v = trace_endpos;
+
+ for(i = 0; i < 64; i += 4)
+ {
+ tracebox(o, '-1 -1 -1' * i, '1 1 1' * i, o - '0 0 32768', MOVE_WORLDONLY, world);
+ if(trace_fraction == 1)
+ continue;
+ print(ftos(i), " -> ", vtos(trace_endpos), "\n");
+ }
+
+ break;
+ }
+}
+
float world_already_spawned;
void RegisterWeapons();
void Nagger_Init();
@@ -406,6 +436,8 @@
next_pingtime = time + 5;
InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);
+ detect_maptype();
+
world_initialized = 1;
}
More information about the nexuiz-commits
mailing list