Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove active vessel restriction #230

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove active vessel restriction #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c92d2
Remove active vessel restriction from FSengineBladed
josuenos Jul 19, 2023
9c731b8
Remove other extraneous active vessel checks.
josuenos Jul 19, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,5 @@ pip-log.txt
#Mr Developer
.mr.developer.cfg
*.zip
/.vs/slnx.sqlite
/.vs/VSWorkspaceState.json
2 changes: 1 addition & 1 deletion Firespitter/aero/FSairBrake.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public override void OnStart(PartModule.StartState state)

public void FixedUpdate()
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;


float angleChange = targetAngle - currentAngle;
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/animation/FSanimatedAirIntake.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public override void OnStart(PartModule.StartState state)
public override void OnFixedUpdate()
{
base.OnFixedUpdate();
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;
if (intakeMeshTransform != null && intakeModule != null)
{
float modifiedFlow = intakeModule.airFlow - flowAtAnimateStart;
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/cockpit/FSActionGroupSwitch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public void Update()
if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA
|| CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.Internal)
{
bool groupState = FlightGlobals.ActiveVessel.ActionGroups.groups[actionGroupNumber];
bool groupState = vessel.ActionGroups.groups[actionGroupNumber];

if (switchTypeEnum == SwitchType.flipSwitch)
{
Expand Down
4 changes: 2 additions & 2 deletions Firespitter/cockpit/FSinternalPropRotator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public override void OnUpdate()
{
base.OnUpdate();

if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

smoothBrake = Mathf.Lerp(smoothBrake, (FlightGlobals.ActiveVessel.ActionGroups.groups[brakeActionInt] ? 1 : 0), 0.1f);
smoothBrake = Mathf.Lerp(smoothBrake, (vessel.ActionGroups.groups[brakeActionInt] ? 1 : 0), 0.1f);

if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA
|| CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.Internal)
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/cockpit/FSmonitorScript.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public void createTextGrid()
public override void OnUpdate()
{
base.OnUpdate();
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

// Run once. (Must be run after all parts have been created, so it can't be in the OnAwake)
if (!monitorDefaultStateSet)
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/control/FSmoveCraftAtLaunch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public void fixCraftLock()
{
if (this.hasLaunched) return;
if (this.isDefaultPosition) return;
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

{
//Debug.Log("FSmoveCraftAtLaunch: Launching vessel at " + positionDisplayName + ", lat " + latitude + ", long " + longitude + ", alt " + altitude);
Expand Down
4 changes: 2 additions & 2 deletions Firespitter/engine/FS engine modules/FSengineBladed.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private void setupBlades()

public override void FixedUpdate()
{
if (!HighLogic.LoadedSceneIsFlight || !flightStarted || vessel != FlightGlobals.ActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight || !flightStarted) return;

float airDirection = getAirSpeed();

Expand Down Expand Up @@ -314,7 +314,7 @@ public override void OnUpdate()
{
base.OnUpdate();

if (!HighLogic.LoadedSceneIsFlight || !flightStarted || vessel != FlightGlobals.ActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight || !flightStarted) return;

getCollectiveInput();

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/FSrotorTrim.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public void FixedUpdate()
{
if (initialized)
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

FlightCtrlState ctrl = vessel.ctrlState;

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FSVTOLrotator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ private void hideAllExternalPopups()

public void FixedUpdate() // moved angle update to fixed update to make rotation speed indpendent of framerate
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

float angleChange = targetAngle - currentAngle;

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FSengineHover.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public override void OnStart(PartModule.StartState state)
public override void OnFixedUpdate()
{
base.OnFixedUpdate();
if (HighLogic.LoadedSceneIsFlight && vessel == FlightGlobals.ActiveVessel)
if (HighLogic.LoadedSceneIsFlight)
{
if (hoverActive)
{
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FShoverThrottle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public override void OnStart(PartModule.StartState state)
public override void OnUpdate()
{
base.OnUpdate();
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel || !engine.EngineIgnited) return;
if (!HighLogic.LoadedSceneIsFlight || !engine.EngineIgnited) return;

double pqsAltitude = vessel.pqsAltitude;
if (pqsAltitude < 0) pqsAltitude = 0;
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FSmultiAxisEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public override void OnStart(PartModule.StartState state)
public override void OnFixedUpdate()
{
base.OnFixedUpdate();
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;
FlightCtrlState ctrl = vessel.ctrlState;
Vector3 steeringInput = new Vector3(0, 0, 0);

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FSpropellerAtmosphericNerf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public override void OnStart(PartModule.StartState state)

public override void OnUpdate()
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;
float atmosphericModifier = ((float)part.staticPressureAtm * thrustModifier);
if ((atmosphericModifier > 1f && thrustModifier > 1f) || disableAtmosphericNerf) atmosphericModifier = 1f; // not setting modifier to 1 at thrustModifier 1 or lower allows for engine that are better than normal in atmospeheres above 1
float newThrust = fullThrottle * atmosphericModifier * engineModeModifier * steeringModifier;
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FStailRotorThrust.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void FixedUpdate()
{
if (initialized)
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;
FlightCtrlState ctrl = vessel.ctrlState;
Vector3 steeringInput = new Vector3(0, 0, 0);

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/engine/Stock based modules/FSthrottlePropSpinner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class FSthrottlePropSpinner : PartModule

public override void OnUpdate()
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

var engine = part.Modules.OfType<ModuleEngines>().FirstOrDefault();

Expand Down
2 changes: 1 addition & 1 deletion Firespitter/water/FSrudder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public override void OnStart(PartModule.StartState state)
public void FixedUpdate()
{
//base.OnFixedUpdate();
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;

if (firstRun)
{
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/wheel/FSpartTurner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public override void OnStart(PartModule.StartState state)

public override void OnUpdate()
{
if (!HighLogic.LoadedSceneIsFlight || !vessel.isActiveVessel) return;
if (!HighLogic.LoadedSceneIsFlight) return;
FlightCtrlState ctrl = vessel.ctrlState;

int reverseModifier = 1;
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/wheel/FSwheel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ public void FixedUpdate()

#region Active vessel code

if (vessel.isActiveVessel && base.vessel.IsControllable)
if (base.vessel.IsControllable)
{
disableColliders();

Expand Down