YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-23 21:24:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sohl1.2' into zombie-x

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-06-20 04:48:28 +05:00
commit d96cb2bbce
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cl_dll/tri.cpp
View File

@ -243,7 +243,6 @@ extern ParticleSystemManager* g_pParticleSystems; // LRC
void DLLEXPORT HUD_DrawTransparentTriangles( void )
{
<<<<<<< HEAD
BlackFog();
//22/03/03 LRC: shiny surfaces
@ -258,10 +257,7 @@ void DLLEXPORT HUD_DrawTransparentTriangles( void )
// LRC: draw and update particle systems
g_pParticleSystems->UpdateSystems(fTime - fOldTime);
#if defined( TEST_IT )
=======
#if TEST_IT
>>>>>>> master
// Draw_Triangles();
#endif
}