OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Merge branch 'devel' into experimental

Browse source
This commit is contained in:
Marisa the Magician 2019-04-20 13:26:37 +02:00
commit c36a730d13
13 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/biorifle.zsc
View file

@ -158,7 +158,7 @@ Class BioXLight : DynamicLight
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
args[LIGHT_RED] = int(64*lifetime);
args[LIGHT_GREEN] = int(255*lifetime);
args[LIGHT_BLUE] = int(48*lifetime);
@ -211,7 +211,7 @@ Class BioGel : Actor
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
if ( !bNOGRAVITY )
{
roll += rollvel;
@ -624,7 +624,7 @@ Class BioGlob : BioGel
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
for ( int i=0; i<2; i++ )
{