actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorMultiTexture.cpp
+6 -6
View File
@@ -9,7 +9,7 @@
#include "RageTexture.h"
#include "RageUtil.h"
#include "ActorUtil.h"
#include "Foreach.h"
#include "LuaBinding.h"
#include "LuaManager.h"
@@ -35,8 +35,8 @@ ActorMultiTexture::ActorMultiTexture( const ActorMultiTexture &cpy ):
CPY( m_aTextureUnits );
#undef CPY
FOREACH( TextureUnitState, m_aTextureUnits, tex )
tex->m_pTexture = TEXTUREMAN->CopyTexture( tex->m_pTexture );
for (TextureUnitState &tex : m_aTextureUnits)
tex.m_pTexture = TEXTUREMAN->CopyTexture( tex.m_pTexture );
}
void ActorMultiTexture::SetTextureCoords( const RectF &r )
@@ -58,14 +58,14 @@ void ActorMultiTexture::SetSizeFromTexture( RageTexture *pTexture )
void ActorMultiTexture::ClearTextures()
{
FOREACH( TextureUnitState, m_aTextureUnits, tex )
TEXTUREMAN->UnloadTexture( tex->m_pTexture );
for (TextureUnitState &tex : m_aTextureUnits)
TEXTUREMAN->UnloadTexture( tex.m_pTexture );
m_aTextureUnits.clear();
}
int ActorMultiTexture::AddTexture( RageTexture *pTexture )
{
if( pTexture == NULL )
if( pTexture == nullptr )
{
LOG->Warn( "Can't add nil texture to ActorMultiTexture" );
return m_aTextureUnits.size();