r4232 - in trunk/data: qcsrc/client qcsrc/server scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Aug 29 05:16:04 EDT 2008
Author: div0
Date: 2008-08-29 05:15:58 -0400 (Fri, 29 Aug 2008)
New Revision: 4232
Modified:
trunk/data/qcsrc/client/laser.qc
trunk/data/qcsrc/server/t_plats.qc
trunk/data/scripts/entities.def
Log:
func_plat: wait -1 makes it seamless
laser: color fix
Modified: trunk/data/qcsrc/client/laser.qc
===================================================================
--- trunk/data/qcsrc/client/laser.qc 2008-08-29 08:43:04 UTC (rev 4231)
+++ trunk/data/qcsrc/client/laser.qc 2008-08-29 09:15:58 UTC (rev 4232)
@@ -100,7 +100,7 @@
}
else
{
- Draw_CylindricLine(self.origin, trace_endpos, 2, "particles/laserbeam", 0, time * 3, self.colormod, 1, DRAWFLAG_ADDITIVE); // TODO make a texture to make the laser look smoother
+ Draw_CylindricLine(self.origin, trace_endpos, 2, "particles/laserbeam", 0, time * 3, self.colormod, 0.5, DRAWFLAG_ADDITIVE); // TODO make a texture to make the laser look smoother
}
pointparticles(self.cnt, trace_endpos, trace_plane_normal, 256 * drawframetime);
}
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2008-08-29 08:43:04 UTC (rev 4231)
+++ trunk/data/qcsrc/server/t_plats.qc 2008-08-29 09:15:58 UTC (rev 4232)
@@ -240,10 +240,20 @@
self.wait = targ.wait;
if (!self.wait)
self.wait = 0.1;
- if (targ.speed)
- SUB_CalcMove(targ.origin - self.mins, targ.speed, train_wait);
+ if(self.wait < 0)
+ {
+ if (targ.speed)
+ SUB_CalcMove(targ.origin - self.mins, targ.speed, train_next);
+ else
+ SUB_CalcMove(targ.origin - self.mins, self.speed, train_next);
+ }
else
- SUB_CalcMove(targ.origin - self.mins, self.speed, train_wait);
+ {
+ if (targ.speed)
+ SUB_CalcMove(targ.origin - self.mins, targ.speed, train_wait);
+ else
+ SUB_CalcMove(targ.origin - self.mins, self.speed, train_wait);
+ }
};
void func_train_find()
Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def 2008-08-29 08:43:04 UTC (rev 4231)
+++ trunk/data/scripts/entities.def 2008-08-29 09:15:58 UTC (rev 4232)
@@ -605,7 +605,7 @@
target: point to next path_corner in the path.
targetname: the train following the path or the previous path_corner in the path points to this.
speed: speed of func_train while moving to this path corner. If unset, the value from the func_train will be used.
-wait: number of seconds func_train will pause on this path corner before moving to next path corner (default: 0.1; to not wait, set this to something like 0.001)
+wait: number of seconds func_train will pause on this path corner before moving to next path corner (default: 0.1; to not wait, set this to -1
*/
/*QUAKED runematch_spawn_point (.3 .3 1) (-16 -16 -16) (16 16 16)
More information about the nexuiz-commits
mailing list