actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/ActorFrameTexture.cpp
+4 -4
View File
@@ -18,7 +18,7 @@ ActorFrameTexture::ActorFrameTexture()
++i;
m_sTextureName = ssprintf( ConvertI64FormatString("ActorFrameTexture %lli"), i );
m_pRenderTarget = NULL;
m_pRenderTarget = nullptr;
}
ActorFrameTexture::ActorFrameTexture( const ActorFrameTexture &cpy ):
@@ -35,7 +35,7 @@ ActorFrameTexture::~ActorFrameTexture()
void ActorFrameTexture::Create()
{
if( m_pRenderTarget != NULL )
if( m_pRenderTarget != nullptr )
{
LuaHelpers::ReportScriptError( "Can't Create an already created ActorFrameTexture" );
return;
@@ -71,7 +71,7 @@ void ActorFrameTexture::Create()
void ActorFrameTexture::DrawPrimitives()
{
if( m_pRenderTarget == NULL )
if( m_pRenderTarget == nullptr )
return;
m_pRenderTarget->BeginRenderingTo( m_bPreserveTexture );
@@ -97,7 +97,7 @@ public:
static int GetTexture( T* p, lua_State *L )
{
RageTexture *pTexture = p->GetTexture();
if( pTexture == NULL )
if( pTexture == nullptr )
{
lua_pushnil(L);
}