Skip to content

Commit 762e0bd

Browse files
mwinkensKaffeine
authored andcommitted
square up laser door heads
(cherry picked from commit 0c6c496)
1 parent 261b4e4 commit 762e0bd

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

src/game/client/components/items.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,16 @@ void CItems::RenderLaser(const CLaserData *pCurrent, bool IsPredicted)
349349
}
350350

351351
// render head
352+
if(Type == LASERTYPE_DOOR)
353+
{
354+
Graphics()->TextureClear();
355+
Graphics()->QuadsSetRotation(0);
356+
Graphics()->SetColor(OuterColor);
357+
Graphics()->RenderQuadContainerEx(m_ItemsQuadContainerIndex, m_DoorHeadOffset, 1, Pos.x - 8.0f, Pos.y - 8.0f);
358+
Graphics()->SetColor(InnerColor);
359+
Graphics()->RenderQuadContainerEx(m_ItemsQuadContainerIndex, m_DoorHeadOffset, 1, Pos.x - 6.0f, Pos.y - 6.0f, 6.f / 8.f, 6.f / 8.f);
360+
}
361+
else
352362
{
353363
int CurParticle = (Client()->GameTick(g_Config.m_ClDummy) % 3);
354364
Graphics()->TextureSet(GameClient()->m_ParticlesSkin.m_aSpriteParticleSplat[CurParticle]);
@@ -803,6 +813,9 @@ void CItems::OnInit()
803813
ParticleSplatOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 24.f);
804814
}
805815

816+
IGraphics::CQuadItem Brick(0, 0, 16.0f, 16.0f);
817+
m_DoorHeadOffset = Graphics()->QuadContainerAddQuads(m_ItemsQuadContainerIndex, &Brick, 1);
818+
806819
Graphics()->QuadContainerUpload(m_ItemsQuadContainerIndex);
807820
}
808821

src/game/client/components/items.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class CItems : public CComponent
3737
int m_aPickupWeaponArmorOffset[4];
3838
int m_aProjectileOffset[NUM_WEAPONS];
3939
int m_aParticleSplatOffset[3];
40+
int m_DoorHeadOffset;
4041
};
4142

4243
#endif

src/game/client/components/menus_settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3442,7 +3442,7 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
34423442

34433443
RightView.HSplitTop(LaserPreviewHeight, &LaserPreview, &RightView);
34443444
RightView.HSplitTop(2 * MarginSmall, nullptr, &RightView);
3445-
DoLaserPreview(&LaserPreview, LaserFreezeOutlineColor, LaserFreezeInnerColor, LASERTYPE_DOOR);
3445+
DoLaserPreview(&LaserPreview, LaserFreezeOutlineColor, LaserFreezeInnerColor, LASERTYPE_FREEZE);
34463446
}
34473447
}
34483448

0 commit comments

Comments
 (0)