Merge branch 'master' into clcampaign

Author: nekonomicon

cl_dll/hl/hl_baseentity.cpp

@@ -108,6 +108,8 @@ Vector UTIL_VecToAngles( const Vector &vec ){ return 0; }
 CSprite *CSprite::SpriteCreate( const char *pSpriteName, const Vector &origin, BOOL animate ) { return 0; }
 void CBeam::PointEntInit( const Vector &start, int endIndex ) { }
 CBeam *CBeam::BeamCreate( const char *pSpriteName, int width ) { return NULL; }
+const Vector &CBeam::GetStartPos( void ){ return g_vecZero; }
+const Vector &CBeam::GetEndPos( void ){ return g_vecZero; }
 void CSprite::Expand( float scaleSpeed, float fadeSpeed ) { }
 
 CBaseEntity* CBaseMonster::CheckTraceHullAttack( float flDist, int iDamage, int iDmgType ) { return NULL; }

cl_dll/hud_spectator.cpp

@@ -1470,6 +1470,7 @@ void CHudSpectator::DrawOverviewLayer()
 					gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
 					gEngfuncs.pTriAPI->Vertex3f( x, y + yStep, z);
 				gEngfuncs.pTriAPI->End();
+				gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
 
 				frame++;
 				x += xStep;
@@ -1509,6 +1510,7 @@ void CHudSpectator::DrawOverviewLayer()
 					gEngfuncs.pTriAPI->TexCoord2f( 1, 0 );
 					gEngfuncs.pTriAPI->Vertex3f( x, y + yStep, z );
 				gEngfuncs.pTriAPI->End();
+				gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
 
 				frame++;
 
@@ -1711,6 +1713,7 @@ void CHudSpectator::DrawOverviewEntities()
 		gEngfuncs.pTriAPI->TexCoord2f( 1.0f, 1.0f );
 		gEngfuncs.pTriAPI->Vertex3f( x + left[0], y + left[1], ( z + left[2] ) * zScale );
 	gEngfuncs.pTriAPI->End ();
+	gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
 }
 
 void CHudSpectator::DrawOverview()

wscript

@@ -188,7 +188,7 @@ def configure(conf):
 		]
 
 		opt_cflags = [
-			'-Werror=declaration-after-statement',
+			# '-Werror=declaration-after-statement',
 			'-Werror=enum-conversion',
 			'-Werror=implicit-int',
 			'-Werror=implicit-function-declaration',