vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

TW: Added TOGGLEDIR flag for func_rotating...

Browse source
This commit is contained in:
Marco Cawthorne 2020-01-20 19:35:10 +01:00
parent 673cf9dbf8
commit 905e90d499
2 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/gs-entbase/server/func_rotating.cpp
View file

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED func_rotating (0 .5 .8) ? FR_STARTON FR_REVERSE FR_ZAXIS FR_XAXIS FR_ACCDCC FR_FANPAIN FR_NOTSOLID FR_SMALLRADIUS FR_MRADIUS FR_LRADIUS
/*QUAKED func_rotating (0 .5 .8) ? FR_STARTON FR_REVERSE FR_ZAXIS FR_XAXIS FR_ACCDCC FR_FANPAIN FR_NOTSOLID FR_SMALLRADIUS FR_MRADIUS FR_LRADIUS FR_TOGGLEDIR
"targetname" Name
"target" Target when triggered.
"killtarget" Target to kill when triggered.
@ -24,18 +24,23 @@
Rotating brush object. Useful for fans, etc.
*/
#ifdef DEVELOPER
var int autocvar_dev_rotspeed = 0;
#endif
enumflags
{
FR_STARTON,
FR_REVERSE,
FR_ZAXIS,
FR_XAXIS,
FR_ACCDCC,
FR_FANPAIN,
FR_NOTSOLID,
FR_SMALLRADIUS,
FR_MRADIUS,
FR_LRADIUS
FR_STARTON, // 1
FR_REVERSE, // 2
FR_ZAXIS, // 4
FR_XAXIS, // 8
FR_ACCDCC, // 16
FR_FANPAIN, // 32
FR_NOTSOLID, // 64
FR_SMALLRADIUS, // 128
FR_MRADIUS, // 256
FR_LRADIUS, // 512
FR_TOGGLEDIR // 1024
};
class func_rotating : CBaseTrigger
@ -43,6 +48,8 @@ class func_rotating : CBaseTrigger
vector m_vecMoveDir;
float m_flSpeed;
float m_flDamage;
float m_flDir;
void() func_rotating;
virtual void() Respawn;
virtual void() Trigger;
@ -61,7 +68,16 @@ void func_rotating :: Trigger ( void )
if ( vlen( avelocity ) ) {
avelocity = [0,0,0];
} else {
avelocity = m_vecMoveDir * m_flSpeed;
float flSpeed;
if (spawnflags & FR_TOGGLEDIR && m_flDir) {
flSpeed = m_flSpeed * -1;
} else {
flSpeed = m_flSpeed;
}
avelocity = m_vecMoveDir * flSpeed;
m_flDir = 1 - m_flDir;
}
}
@ -78,6 +94,14 @@ void func_rotating :: Blocked ( void )
void func_rotating :: Respawn ( void )
{
#ifdef DEVELOPER
if (autocvar_dev_rotspeed != 0) {
m_flSpeed = autocvar_dev_rotspeed;
}
#endif
m_flDir = 0; /* Reset */
movetype = MOVETYPE_PUSH;
setorigin( this, origin );
setmodel( this, model );

10
src/gs-entbase/server/path_corner.cpp
View file

@ -34,6 +34,10 @@ teleport to the position of the next node (target).
With the PC_FIREONCE flag set, it'll only fire its target (message) once.
*/
#ifdef DEVELOPER
var int autocvar_dev_cornerspeed = 0;
#endif
enumflags {
PC_WAIT,
PC_TELEPORT,
@ -71,6 +75,12 @@ path_corner::Trigger(void)
void
path_corner::Respawn(void)
{
#ifdef DEVELOPER
if (autocvar_dev_cornerspeed != 0) {
m_flSpeed = autocvar_dev_cornerspeed;
}
#endif
m_iFired = FALSE;
}