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/FadingBanner.cpp
+6 -6
View File
@@ -166,7 +166,7 @@ bool FadingBanner::LoadFromCachedBanner( const RString &path )
void FadingBanner::LoadFromSong( const Song* pSong )
{
if( pSong == NULL )
if( pSong == nullptr )
{
LoadFallback();
return;
@@ -195,7 +195,7 @@ void FadingBanner::LoadFromSongGroup( RString sSongGroup )
void FadingBanner::LoadFromCourse( const Course* pCourse )
{
if( pCourse == NULL )
if( pCourse == nullptr )
{
LoadFallback();
return;
@@ -272,25 +272,25 @@ public:
static int ScaleToClipped( T* p, lua_State *L ) { p->ScaleToClipped(FArg(1),FArg(2)); COMMON_RETURN_SELF; }
static int LoadFromSong( T* p, lua_State *L )
{
if( lua_isnil(L,1) ) { p->LoadFromSong( NULL ); }
if( lua_isnil(L,1) ) { p->LoadFromSong(nullptr); }
else { Song *pS = Luna<Song>::check(L,1); p->LoadFromSong( pS ); }
COMMON_RETURN_SELF;
}
static int LoadFromCourse( T* p, lua_State *L )
{
if( lua_isnil(L,1) ) { p->LoadFromCourse( NULL ); }
if( lua_isnil(L,1) ) { p->LoadFromCourse(nullptr); }
else { Course *pC = Luna<Course>::check(L,1); p->LoadFromCourse( pC ); }
COMMON_RETURN_SELF;
}
static int LoadIconFromCharacter( T* p, lua_State *L )
{
if( lua_isnil(L,1) ) { p->LoadIconFromCharacter( NULL ); }
if( lua_isnil(L,1) ) { p->LoadIconFromCharacter(nullptr); }
else { Character *pC = Luna<Character>::check(L,1); p->LoadIconFromCharacter( pC ); }
COMMON_RETURN_SELF;
}
static int LoadCardFromCharacter( T* p, lua_State *L )
{
if( lua_isnil(L,1) ) { p->LoadIconFromCharacter( NULL ); }
if( lua_isnil(L,1) ) { p->LoadIconFromCharacter(nullptr); }
else { Character *pC = Luna<Character>::check(L,1); p->LoadIconFromCharacter( pC ); }
COMMON_RETURN_SELF;
}