mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-08 11:01:33 +00:00
Merge 70ab4f69c3
into 65aa7c910e
This commit is contained in:
commit
43752acad6
1 changed files with 6 additions and 6 deletions
|
@ -2154,11 +2154,11 @@ void UTIL_SetClientVisibilityPVS( edict_t *pClient, const unsigned char *pvs, in
|
|||
|
||||
g_CheckClient.m_bClientPVSIsExpanded = false;
|
||||
|
||||
unsigned *pFrom = (unsigned *)pvs;
|
||||
unsigned *pMask = (unsigned *)g_CheckClient.m_checkPVS;
|
||||
unsigned *pTo = (unsigned *)g_CheckClient.m_checkVisibilityPVS;
|
||||
size_t *pFrom = (size_t *)pvs;
|
||||
size_t *pMask = (size_t *)g_CheckClient.m_checkPVS;
|
||||
size_t *pTo = (size_t *)g_CheckClient.m_checkVisibilityPVS;
|
||||
|
||||
int limit = pvssize / 4;
|
||||
int limit = pvssize / static_cast<int>( sizeof(size_t) );
|
||||
int i;
|
||||
|
||||
for ( i = 0; i < limit; i++ )
|
||||
|
@ -2171,10 +2171,10 @@ void UTIL_SetClientVisibilityPVS( edict_t *pClient, const unsigned char *pvs, in
|
|||
}
|
||||
}
|
||||
|
||||
int remainder = pvssize % 4;
|
||||
int remainder = pvssize % static_cast<int>( sizeof(size_t) );
|
||||
for ( i = 0; i < remainder; i++ )
|
||||
{
|
||||
((unsigned char *)&pTo[limit])[i] = ((unsigned char *)&pFrom[limit])[i] & !((unsigned char *)&pMask[limit])[i];
|
||||
((unsigned char *)&pTo[limit])[i] = ((unsigned char *)&pFrom[limit])[i] & ~((unsigned char *)&pMask[limit])[i];
|
||||
|
||||
if ( ((unsigned char *)&pFrom[limit])[i] != 0)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue