Skip to content

Add C_BaseEntity::CanGlow to opt-out of glowing for Sentry Gun shield #1508

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add C_BaseEntity::CanGlow to opt-out of glowing for Sentry Gun shield #1508

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
4 changes: 4 additions & 0 deletions src/game/client/c_baseentity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,10 @@ class C_BaseEntity : public IClientEntity

void TrackAngRotation( bool bTrack );

#ifdef GLOWS_ENABLE
virtual bool CanGlow() const { return true; }
#endif // GLOWS_ENABLE

private:
friend void OnRenderStart();

Expand Down
2 changes: 1 addition & 1 deletion src/game/client/glow_outline_effect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void CGlowObjectManager::GlowObjectDefinition_t::DrawModel()

while ( pAttachment != NULL )
{
if ( !g_GlowObjectManager.HasGlowEffect( pAttachment ) && pAttachment->ShouldDraw() )
if ( !g_GlowObjectManager.HasGlowEffect( pAttachment ) && pAttachment->ShouldDraw() && pAttachment->CanGlow() )
{
pAttachment->DrawModel( STUDIO_RENDER );
}
Expand Down
1 change: 1 addition & 0 deletions src/game/client/glow_outline_effect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class CGlowObjectManager
( m_nSplitScreenSlot == GLOW_FOR_ALL_SPLIT_SCREEN_SLOTS || m_nSplitScreenSlot == nSlot ) &&
( m_bRenderWhenOccluded || m_bRenderWhenUnoccluded ) &&
m_hEntity->ShouldDraw() &&
m_hEntity->CanGlow() &&
!m_hEntity->IsDormant();
}

Expand Down
1 change: 1 addition & 0 deletions src/game/client/tf/c_obj_sentrygun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class C_SentrygunShield : public C_BaseAnimating
static C_SentrygunShield* Create( const char* pszModelName );

virtual void ClientThink();
virtual bool CanGlow() const OVERRIDE { return false; }

void StartFadeOut( float flDuration );

Expand Down