Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

radio systems replace all entity query with enumerator (#15449)

Browse Source
This commit is contained in:
Slava0135
2023-04-23 11:29:08 +03:00
committed by GitHub
parent 9c9c273a4c
commit 8aef835d33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Radio/EntitySystems/JammerSystem.cs
View File

@@ -25,7 +25,7 @@ public sealed class JammerSystem : EntitySystem
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
var query = AllEntityQuery<ActiveRadioJammerComponent, RadioJammerComponent>(); var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent>();
while (query.MoveNext(out var uid, out var _, out var jam)) while (query.MoveNext(out var uid, out var _, out var jam))
{ {
if (_powerCell.TryGetBatteryFromSlot(uid, out var battery) && if (_powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
@@ -78,7 +78,7 @@ public sealed class JammerSystem : EntitySystem
private void OnRadioSendAttempt(ref RadioSendAttemptEvent args) private void OnRadioSendAttempt(ref RadioSendAttemptEvent args)
{ {
var source = Transform(args.RadioSource).Coordinates; var source = Transform(args.RadioSource).Coordinates;
var query = AllEntityQuery<ActiveRadioJammerComponent, RadioJammerComponent, TransformComponent>(); var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent, TransformComponent>();
while (query.MoveNext(out _, out _, out var jam, out var transform)) while (query.MoveNext(out _, out _, out var jam, out var transform))
{ {
if (source.InRange(EntityManager, _transform, transform.Coordinates, jam.Range)) if (source.InRange(EntityManager, _transform, transform.Coordinates, jam.Range))

2
Content.Server/Radio/EntitySystems/RadioSystem.cs
View File

@@ -87,7 +87,7 @@ public sealed class RadioSystem : EntitySystem
var hasMicro = HasComp<RadioMicrophoneComponent>(radioSource); var hasMicro = HasComp<RadioMicrophoneComponent>(radioSource);
var speakerQuery = GetEntityQuery<RadioSpeakerComponent>(); var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
var radioQuery = AllEntityQuery<ActiveRadioComponent, TransformComponent>(); var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
var sentAtLeastOnce = false; var sentAtLeastOnce = false;
while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform)) while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
{ {