diff options
| author | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
|---|---|---|
| committer | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
| commit | 0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch) | |
| tree | c831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/client/spritemodel.cpp | |
| parent | Updated the SDK with the latest code from the TF and HL2 branches. (diff) | |
| download | source-sdk-2013-master.tar.xz source-sdk-2013-master.zip | |
Diffstat (limited to 'mp/src/game/client/spritemodel.cpp')
| -rw-r--r-- | mp/src/game/client/spritemodel.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mp/src/game/client/spritemodel.cpp b/mp/src/game/client/spritemodel.cpp index 018e918f..09284865 100644 --- a/mp/src/game/client/spritemodel.cpp +++ b/mp/src/game/client/spritemodel.cpp @@ -201,7 +201,7 @@ static void AdjustSubRect(CEngineSprite *pSprite, int frame, float *pfLeft, floa *pw = rc.right - rc.left; *ph = rc.bottom - rc.top; - f = 1.0 / (float)pSprite->GetWidth();; + f = 1.0 / (float)pSprite->GetWidth(); *pfLeft = ((float)rc.left + 0.5) * f; *pfRight = ((float)rc.right - 0.5) * f; @@ -415,12 +415,14 @@ IMaterial *CEngineSprite::GetMaterial( RenderMode_t nRenderMode, int nFrame ) m_VideoMaterial->SetFrame( nFrame ); } - IMaterial *pMaterial = m_material[nRenderMode]; - IMaterialVar* pFrameVar = pMaterial->FindVarFast( "$frame", &frameCache ); - if ( pFrameVar ) + if ( pMaterial ) { - pFrameVar->SetIntValue( nFrame ); + IMaterialVar* pFrameVar = pMaterial->FindVarFast( "$frame", &frameCache ); + if ( pFrameVar ) + { + pFrameVar->SetIntValue( nFrame ); + } } return pMaterial; |