mirror of https://github.com/FWGS/hlsdk-xash3d
Merge branch 'sohl1.2' into aomdc
This commit is contained in:
commit
6f9e689eb7
|
@ -234,7 +234,6 @@ extern ParticleSystemManager* g_pParticleSystems; // LRC
|
|||
|
||||
void DLLEXPORT HUD_DrawTransparentTriangles( void )
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
BlackFog();
|
||||
|
||||
//22/03/03 LRC: shiny surfaces
|
||||
|
@ -249,10 +248,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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue