Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ class ACE_CookOff_HelperEntity : GenericEntity
[RplRpc(RplChannel.Reliable, RplRcver.Broadcast)]
protected void RpcDo_PlayCookoffSoundBroadcast(ACE_CookOff_EAmmoType ammoType)
{
SCR_SoundManagerEntity soundManagerEntity = GetGame().GetSoundManagerEntity();
if (soundManagerEntity)
soundManagerEntity.CreateAndPlayAudioSource(this, s_pData.GetAudioSourceConfig(ammoType));
SCR_SoundManagerModule.CreateAndPlayAudioSource(this, s_pData.GetAudioSourceConfig(ammoType));
}

//------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ modded class SCR_FlammableHitZone : SCR_VehicleHitZone
if (isBurning == shouldBeBurning)
return;

ACE_CookOff_DetonateAmmoSystem system = ACE_CookOff_DetonateAmmoSystem.GetInstance();
ACE_CookOff_DetonateAmmoSystem system = ACE_CookOff_DetonateAmmoSystem.GetInstance(GetOwner().GetWorld());
if (!system)
return;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ class ACE_CookOff_DetonateAmmoSystem : GameSystem
protected ref ACE_CookOff_DetonateAmmo_JobScheduler m_pScheduler;

//------------------------------------------------------------------------------------------------
static ACE_CookOff_DetonateAmmoSystem GetInstance()
static ACE_CookOff_DetonateAmmoSystem GetInstance(ChimeraWorld world)
{
ChimeraWorld world = GetGame().GetWorld();
return ACE_CookOff_DetonateAmmoSystem.Cast(world.FindSystem(ACE_CookOff_DetonateAmmoSystem));
}

//------------------------------------------------------------------------------------------------
//! Should be paused when the world is not running
override bool ShouldBePaused()
{
return true;
}

//------------------------------------------------------------------------------------------------
override static void InitInfo(WorldSystemInfo outInfo)
{
super.InitInfo(outInfo);
outInfo.SetAbstract(false)
.SetUnique(true)
.SetLocation(ESystemLocation.Server);
.SetLocation(WorldSystemLocation.Server)
.AddPoint(WorldSystemPoint.FixedFrame);
}

//------------------------------------------------------------------------------------------------
//! Should be paused when the world is not running
override bool ShouldBePaused()
{
return true;
}

override protected void OnInit()
{
m_pScheduler.OnInit(CreateTemplateJob());
Expand Down

This file was deleted.