Skip to content

Gravity no longer affects inertialess drives #20

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

Open
INeedAUniqueUsername wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Gravity no longer affects inertialess drives #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Include/TSE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,8 @@ class CSpaceObject : public CObject
virtual bool HasAttribute (const CString &sAttribute) const { return sAttribute.IsBlank(); }
virtual bool HasSpecialAttribute (const CString &sAttrib) const;
virtual bool HasVolumetricShadow (void) const { return false; }
//virtual bool IsAffectedByGravity(void) { return IsAnchored(); }
virtual bool IsAffectedByGravity(void) { return true; }
virtual bool IsExplored (void) { return true; }
virtual bool IsImmutable (void) const { return false; }
virtual bool IsKnown (void) { return true; }
Expand Down
3 changes: 2 additions & 1 deletion Include/TSESpaceObjectsImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,8 @@ class CShip : public CSpaceObject
virtual void GetVisibleDamageDesc (SVisibleDamage &Damage) override;
virtual bool HasAttribute (const CString &sAttribute) const override;
virtual bool ImageInObject (const CVector &vObjPos, const CObjectImageArray &Image, int iTick, int iRotation, const CVector &vImagePos) override;
virtual bool IsAnchored (void) const override { return (GetDockedObj() != NULL) || IsManuallyAnchored(); }
virtual bool IsAffectedByGravity(void) { return CSpaceObject::IsAffectedByGravity() && !IsInertialess(); } //This makes sure that Inertialess Drives stop gravity
virtual bool IsAnchored(void) const override { return (GetDockedObj() != NULL) || IsManuallyAnchored(); }
virtual bool IsAngryAt (CSpaceObject *pObj) override;
virtual bool IsAttached (void) const override { return m_fShipCompartment; }
virtual bool IsBlind (void) override { return m_iBlindnessTimer != 0; }
Expand Down
3 changes: 3 additions & 0 deletions TSE/CSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4981,6 +4981,9 @@ void CSystem::UpdateGravity (SUpdateCtx &Ctx, CSpaceObject *pGravityObj)
continue;
}

if (!pObj->IsAffectedByGravity())
continue;

// Compute acceleration

Metric rAccel = r1EAccel * rScaleRadius2 / rDist2;
Expand Down