H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 14:16:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix previous commit

Browse Source
This commit is contained in:
nillerusr 2021-10-05 00:51:01 +03:00
parent 61302b61e7
commit 2f12021cce
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/gl_matsysiface.cpp
View File

@ -966,23 +966,20 @@ void SaveSurfAtCrossHair()
} }
void DebugDrawLightmapAtCrossHair() void DebugDrawLightmapAtCrossHair() // Lol
{ {
return; #if 0
IMaterial *pMaterial; IMaterial *pMaterial;
int lightmapPageSize[2]; int lightmapPageSize[2];
if( s_CrossHairSurfID <= (SurfaceHandle_t)0 ) if( !s_CrossHairSurfID )
{
return; return;
}
materials->GetLightmapPageSize( materialSortInfoArray[MSurf_MaterialSortID( s_CrossHairSurfID )].lightmapPageID, materials->GetLightmapPageSize( materialSortInfoArray[MSurf_MaterialSortID( s_CrossHairSurfID )].lightmapPageID,
&lightmapPageSize[0], &lightmapPageSize[1] ); &lightmapPageSize[0], &lightmapPageSize[1] );
pMaterial = MSurf_TexInfo( s_CrossHairSurfID )->material; pMaterial = MSurf_TexInfo( s_CrossHairSurfID )->material;
// pMaterial->GetLowResColorSample( textureS, textureT, baseColor ); // pMaterial->GetLowResColorSample( textureS, textureT, baseColor );
DrawLightmapPage( materialSortInfoArray[MSurf_MaterialSortID( s_CrossHairSurfID )].lightmapPageID ); DrawLightmapPage( materialSortInfoArray[MSurf_MaterialSortID( s_CrossHairSurfID )].lightmapPageID );
#if 0
int i; int i;
for( i = 0; i < 2; i++ ) for( i = 0; i < 2; i++ )
{ {

8
game/client/clientmode_shared.cpp
View File

@ -1134,9 +1134,7 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
bool bValidTeam = false; bool bValidTeam = false;
if ( (GetLocalTeam() && GetLocalTeam()->GetTeamNumber() == team) ) if ( (GetLocalTeam() && GetLocalTeam()->GetTeamNumber() == team) )
{
bValidTeam = true; bValidTeam = true;
}
//If we're in the spectator team then we should be getting whatever messages the person I'm spectating gets. //If we're in the spectator team then we should be getting whatever messages the person I'm spectating gets.
if ( bValidTeam == false ) if ( bValidTeam == false )
@ -1152,15 +1150,11 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
} }
} }
if ( team == 0 && GetLocalTeam() > (C_Team*)0 ) if ( team == 0 && GetLocalTeam() )
{
bValidTeam = false; bValidTeam = false;
}
if ( team == 255 ) if ( team == 255 )
{
bValidTeam = true; bValidTeam = true;
}
if ( bValidTeam == true ) if ( bValidTeam == true )
{ {

4
materialsystem/shaderapidx9/shaderdevicedx8.cpp
View File

@ -619,10 +619,8 @@ bool CShaderDeviceMgrDx8::ComputeCapsFromD3D( HardwareCaps_t *pCaps, int nAdapte
if ( pVendorID ) if ( pVendorID )
{ {
int nVendorID = V_atoi( pVendorID ); // use V_atoi for hex support int nVendorID = V_atoi( pVendorID ); // use V_atoi for hex support
if ( pVendorID > (HardwareCaps_t*)0 ) if ( pVendorID )
{
ident.VendorId = nVendorID; ident.VendorId = nVendorID;
}
} }
} }

2
serverbrowser/CustomGames.cpp
View File

@ -211,7 +211,7 @@ bool CCustomGames::CheckTagFilter( gameserveritem_t &server )
V_SplitString( m_szTagFilter, ",", TagList ); V_SplitString( m_szTagFilter, ",", TagList );
for ( int i = 0; i < TagList.Count(); i++ ) for ( int i = 0; i < TagList.Count(); i++ )
{ {
if ( ( Q_strnistr( server.m_szGameTags, TagList[i], MAX_TAG_CHARACTERS ) > (const char*)0 ) == TagsExclude() ) if ( ( Q_strnistr( server.m_szGameTags, TagList[i], MAX_TAG_CHARACTERS ) ) == TagsExclude() )
{ {
bRetVal = false; bRetVal = false;
break; break;