[nexuiz-commits] r6583 - in branches/nexuiz-2.0: . data misc/tools
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Apr 23 16:43:23 EDT 2009
Author: div0
Date: 2009-04-23 16:43:23 -0400 (Thu, 23 Apr 2009)
New Revision: 6583
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/effectinfo-addcomments.pl
branches/nexuiz-2.0/data/effectinfo.txt
branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler
Log:
r6580 | div0 | 2009-04-23 21:47:00 +0200 (Thu, 23 Apr 2009) | 2 lines
make the script support csqc better
r6581 | mrbougo | 2009-04-23 21:51:08 +0200 (Thu, 23 Apr 2009) | 1 line
updated the effectinfo.txt comments
r6582 | div0 | 2009-04-23 22:40:56 +0200 (Thu, 23 Apr 2009) | 2 lines
allow a .map or .bsp suffix in the command line
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-04-23 20:40:56 UTC (rev 6582)
+++ branches/nexuiz-2.0/.patchsets 2009-04-23 20:43:23 UTC (rev 6583)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6549,6552-6567,6572-6572,6577-6577
+revisions_applied = 1-6536,6541-6549,6552-6567,6572-6572,6577-6577,6580-6582
Modified: branches/nexuiz-2.0/data/effectinfo-addcomments.pl
===================================================================
--- branches/nexuiz-2.0/data/effectinfo-addcomments.pl 2009-04-23 20:40:56 UTC (rev 6582)
+++ branches/nexuiz-2.0/data/effectinfo-addcomments.pl 2009-04-23 20:43:23 UTC (rev 6583)
@@ -20,7 +20,8 @@
{
print STDERR "Handling $1...\n";
$found{$1} = 1;
- my $search =
+ my $search = $1;
+ my $search2 =
$1 eq 'TR_BLOOD' ? 'MF_GIB' :
$1 eq 'TR_SLIGHTBLOOD' ? 'MF_ZOMGIB' :
$1 eq 'TR_WIZSPIKE' ? 'MF_TRACER' :
@@ -31,8 +32,9 @@
$1;
local $ENV{effectre} =
$search eq lc $search
- ? "\"$search\""
- : "\"$search\"|\\<" . lc($search) . "\\>|\\<" . $search . "\\>";
+ ? "\"$search\"|\"$search2\""
+ : "\"$search\"|\\<" . lc($search) . "\\>|\\<" . $search . "\\>|"
+ . "\"$search2\"|\\<" . lc($search2) . "\\>|\\<" . $search2 . "\\>";
print "$ENV{effectre}\n";
my $occurrences = `grep -E "\$effectre" qcsrc/server/*.qc qcsrc/client/*.qc`;
$occurrences =~ s/\r/\n/g;
Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt 2009-04-23 20:40:56 UTC (rev 6582)
+++ branches/nexuiz-2.0/data/effectinfo.txt 2009-04-23 20:43:23 UTC (rev 6583)
@@ -1,7 +1,5 @@
// item respawn effect
// flare particle and light
-// used in qcsrc/server/bots.qc: //te_wizspike(start)
-// used in qcsrc/server/bots.qc: te_wizspike(org)
// used in qcsrc/server/bots.qc: //te_wizspike(e.origin)
// used in qcsrc/server/bots.qc: //te_wizspike(e.nearestwaypoint.wpnearestpoint)
// used in qcsrc/server/havocbot.qc: // te_wizspike(newgoal.origin)
@@ -28,10 +26,6 @@
// laser impact
// decal
-// used in qcsrc/server/bots.qc: //te_knightspike(end)
-// used in qcsrc/server/bots.qc: te_knightspike(start)
-// used in qcsrc/server/bots.qc: te_knightspike(org)
-// used in qcsrc/server/bots.qc: te_knightspike(org)
// used in qcsrc/server/w_seeker.qc: te_knightspike(org2)
effect TE_KNIGHTSPIKE
countabsolute 1
@@ -236,11 +230,7 @@
// shotgun pellet impact
// decal
-// used in qcsrc/server/bots.qc: //te_gunshot(org)
-// used in qcsrc/server/bots.qc: te_gunshot(org)
-// used in qcsrc/server/bots.qc: te_gunshot(org)
-// used in qcsrc/server/bots.qc: // te_gunshot(org)
-// used in qcsrc/server/bots.qc: //te_gunshot(end)
+// used nowhere in code
effect TE_GUNSHOT
countabsolute 1
type decal
@@ -788,7 +778,7 @@
// normal super gory blood trail (used by gibs)
-// used nowhere in code
+// used in qcsrc/client/gibs.qc: trailparticles(self, particleeffectnum("TR_BLOOD"), oldorg, self.origin)
effect TR_BLOOD
trailspacing 16
type blood
@@ -805,7 +795,7 @@
// thinner blood trail (used by quake zombies)
-// used nowhere in code
+// used in qcsrc/client/gibs.qc: trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin)
effect TR_SLIGHTBLOOD
trailspacing 32
type blood
@@ -1107,6 +1097,7 @@
+// used in qcsrc/server/nexball.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
// used in qcsrc/server/w_porto.qc: //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
@@ -1140,7 +1131,8 @@
// hagar trail
// smoke
-// used nowhere in code
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)
effect TR_GRENADE
trailspacing 6
type alphastatic
@@ -1185,7 +1177,9 @@
// mortar trail
// smoke
-// used nowhere in code
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)
effect TR_KNIGHTSPIKE // used for MF_TRACER2
notunderwater
trailspacing 5
@@ -1920,7 +1914,10 @@
// rocket trail
// smoke
-// used nowhere in code
+// used in qcsrc/server/cl_client.qc: self.modelflags |= MF_ROCKET
+// used in qcsrc/server/cl_client.qc: self.modelflags &~= MF_ROCKET
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)
effect TR_ROCKET
trailspacing 5
type alphastatic
@@ -3033,7 +3030,8 @@
// port-o-launch trail
// glowing vapor trail
-// used nowhere in code
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)
effect TR_WIZSPIKE
trailspacing 2
type static
@@ -3064,7 +3062,8 @@
// TAG trail
// glowing vapor trail
-// used nowhere in code
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)
effect TR_VORESPIKE
trailspacing 2
type static
@@ -3211,7 +3210,8 @@
// crylink trail
// plasma smoke
-// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)
effect TR_CRYLINKPLASMA
trailspacing 64
type static
Modified: branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler
===================================================================
--- branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler 2009-04-23 20:40:56 UTC (rev 6582)
+++ branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler 2009-04-23 20:43:23 UTC (rev 6583)
@@ -132,6 +132,7 @@
for my $m(@{$options->{maps}})
{
+ $m =~ s/\.(?:map|bsp)$//;
if($prescale != 1 or $postscale != 1)
{
open my $checkfh, "<", "$m.map"
More information about the nexuiz-commits
mailing list