Weapon sway broken after loading a game Thread - DOOM CE mod for Doom II

As the thread title says, weapon sway is completely broken after loading a save. I uploaded a fix for it, but it hasn't been authorized for a few days now, so might as well get the bug fixed in the main release.

The problem is the event handler for the sway WorldLoaded function must inherit from StaticEventHandler, not EventHandler. You can change the source directly, but my fix was to have a new event handler just for sway:

extend class CEExtrasHandler
{
	void SwayWorldLoaded(WorldEvent e)
	{	
		return; //null this
	}
}

class SwayHandler : StaticEventHandler
{
	SwayManager sway;
	
	override void WorldLoaded(WorldEvent e)
	{
		ThinkerIterator it = ThinkerIterator.Create("SwayManager", Thinker.MAX_STATNUM);
		sway = SwayManager(it.Next());
		
		if (!sway)
		{
			sway = new("SwayManager");
			sway.ChangeStatNum(Thinker.MAX_STATNUM);
			
			for (uint i = 0; i < MAXPLAYERS; ++i)
			{
				if (!playerInGame[i]|| !players[i].mo)
					continue;
				
				sway.prevAngle[i]= players[i].mo.angle;
				sway.prevPitch[i]= players[i].mo.pitch;
				if (!players[i].ReadyWeapon)
				{
					sway.prevY[i]= WEAPONBOTTOM;
					continue;
				}
				
				let psp = players[i].GetPSPrite(PSP_WEAPON);
				sway.prevX[i]= psp.x;
				sway.prevY[i]= psp.y;
			}
		}
		
		sway.CheckCVars();
	}
}

Edited by: TwelveEyes

Thanks, I'll fix this for the next release. I missed it when I merged the event handlers into a single one.