OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Deprecate use of ROTATING. Fix rotation of many items.

Browse source
This commit is contained in:
Mari the Deer 2023-01-11 20:05:53 +01:00
commit 06e2e2c55c
39 changed files with 70 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

17
zscript/items/swwm_baseitem.zsc
View file

@ -197,6 +197,7 @@ Mixin Class SWWMPickupGlow
Class SWWMItemOverlay : SWWMNonInteractiveActor
{
Default
{
RenderStyle "Add";
@ -212,7 +213,7 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
prev = target.prev;
if ( (target.pos != pos) || (target.vel != (0,0,0)) ) SetOrigin(target.pos+target.vel,true);
if ( angle != target.angle ) A_SetAngle(target.angle,SPF_INTERPOLATE);
if ( (angle != target.angle) && bINTERPOLATEANGLES ) angle = target.angle; // copy angle for rotating pickups
FloatBobPhase = target.FloatBobPhase;
bInvisible = target.bInvisible||Inventory(target).Owner;
}
@ -224,6 +225,20 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
}
Mixin Class SWWMRotatingPickup
{
Default
{
+INTERPOLATEANGLES;
}
override void Tick()
{
Super.Tick();
if ( !Owner ) angle -= (180./64.);
}
}
Mixin Class SWWMRespawn
{
override void Hide()