Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2024-12-22 17:47:38 +08:00
Code

Add back some fixes that got clobbered in sync.

Browse Source
This commit is contained in:
Nicholas Hastings 2014-10-30 17:23:34 -04:00
parent 88961a1b35
commit 917a15eeb9
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/bitmap/imageformat.h
View File

@ -376,7 +376,7 @@ namespace ImageLoader
struct ResampleInfo_t
{
ResampleInfo_t() : m_nFlags(0), m_flAlphaThreshhold(0.4f), m_flAlphaHiFreqThreshhold(0.4f), m_nSrcDepth(1), m_nDestDepth(1)
ResampleInfo_t() : m_nSrcDepth(1), m_nDestDepth(1), m_flAlphaThreshhold(0.4f), m_flAlphaHiFreqThreshhold(0.4f), m_nFlags(0)
{
m_flColorScale[0] = 1.0f, m_flColorScale[1] = 1.0f, m_flColorScale[2] = 1.0f, m_flColorScale[3] = 1.0f;
m_flColorGoal[0] = 0.0f, m_flColorGoal[1] = 0.0f, m_flColorGoal[2] = 0.0f, m_flColorGoal[3] = 0.0f;

5
public/studio.h
View File

@ -2571,10 +2571,11 @@ public:
// ctor
CActivityToSequenceMapping( void )
: m_pSequenceTuples(NULL), m_iSequenceTuplesCount(0), m_ActToSeqHash(8,0,0), m_expectedPStudioHdr(NULL), m_expectedVModel(NULL)
: m_pSequenceTuples(NULL), m_iSequenceTuplesCount(0),
#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
, m_bIsInitialized(false)
m_bIsInitialized(false),
#endif
m_ActToSeqHash(8,0,0), m_expectedPStudioHdr(NULL), m_expectedVModel(NULL)
{};
// dtor -- not virtual because this class has no inheritors

16
public/tier1/bitbuf.h
View File

@ -181,7 +181,7 @@ public:
void WriteOneBitAt( int iBit, int nValue );
// Write signed or unsigned. Range is only checked in debug.
void WriteUBitLong( unsigned int data, int numbits, bool bCheckRange=true );
void WriteUBitLong( unsigned int data, int numbits, bool bCheckRange=true ) RESTRICT;
void WriteSBitLong( int data, int numbits );
// Tell it whether or not the data is unsigned. If it's signed,
@ -241,7 +241,7 @@ public:
int GetNumBytesWritten() const;
int GetNumBitsWritten() const;
int GetMaxNumBits();
int GetNumBitsLeft();
int GetNumBitsLeft() RESTRICT;
int GetNumBytesLeft();
unsigned char* GetData();
const unsigned char* GetData() const;
@ -250,7 +250,7 @@ public:
bool CheckForOverflow(int nBits);
inline bool IsOverflowed() const {return m_bOverflow;}
void SetOverflowFlag();
void SetOverflowFlag() RESTRICT;
public:
@ -292,7 +292,7 @@ inline int bf_write::GetMaxNumBits()
return m_nDataBits;
}
inline int bf_write::GetNumBitsLeft()
inline int bf_write::GetNumBitsLeft() RESTRICT
{
return m_nDataBits - m_iCurBit;
}
@ -323,7 +323,7 @@ BITBUF_INLINE bool bf_write::CheckForOverflow(int nBits)
return m_bOverflow;
}
BITBUF_INLINE void bf_write::SetOverflowFlag()
BITBUF_INLINE void bf_write::SetOverflowFlag() RESTRICT
{
#ifdef DBGFLAG_ASSERT
if ( m_bAssertOnOverflow )
@ -635,7 +635,7 @@ public:
public:
int GetNumBytesLeft();
int GetNumBytesRead();
int GetNumBitsLeft();
int GetNumBitsLeft() RESTRICT;
int GetNumBitsRead() const;
// Has the buffer overflowed?
@ -645,7 +645,7 @@ public:
inline bool SeekRelative(int iBitDelta); // Seek to an offset from the current position.
// Called when the buffer is overflowed.
void SetOverflowFlag();
void SetOverflowFlag() RESTRICT;
public:
@ -678,7 +678,7 @@ inline int bf_read::GetNumBytesRead()
return BitByte(m_iCurBit);
}
inline int bf_read::GetNumBitsLeft()
inline int bf_read::GetNumBitsLeft() RESTRICT
{
return m_nDataBits - m_iCurBit;
}

2
tier1/bitbuf.cpp
View File

@ -849,7 +849,7 @@ void bf_read::SetDebugName( const char *pName )
m_pDebugName = pName;
}
void bf_read::SetOverflowFlag()
void bf_read::SetOverflowFlag() RESTRICT
{
if ( m_bAssertOnOverflow )
{