FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sohl1.2' into aomdc

This commit is contained in:
Andrey Akhmichin 2021-06-20 04:49:03 +05:00
parent 7298dfebdd 50f6cf4a40
commit 6f9e689eb7
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

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