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/GameLoop.cpp
+9 -10
View File
@@ -76,13 +76,12 @@ static bool ChangeAppPri()
if( INPUTMAN )
{
INPUTMAN->GetDevicesAndDescriptions(vDevices);
FOREACH_CONST( InputDeviceInfo, vDevices, d )
if (std::any_of(vDevices.begin(), vDevices.end(), [](InputDeviceInfo const &d) {
return d.sDesc.find("NTPAD") != string::npos;
}))
{
if( d->sDesc.find("NTPAD") != string::npos )
{
LOG->Trace( "Using NTPAD. Don't boost priority." );
return false;
}
LOG->Trace( "Using NTPAD. Don't boost priority." );
return false;
}
}
}
@@ -181,7 +180,7 @@ namespace
void DoChangeGame()
{
const Game* g= GAMEMAN->StringToGame(g_NewGame);
ASSERT(g != NULL);
ASSERT(g != nullptr);
GAMESTATE->SetCurGame(g);
bool theme_changing= false;
@@ -358,7 +357,7 @@ private:
enum State { RENDERING_IDLE, RENDERING_START, RENDERING_ACTIVE, RENDERING_END };
State m_State;
};
static ConcurrentRenderer *g_pConcurrentRenderer = NULL;
static ConcurrentRenderer *g_pConcurrentRenderer = nullptr;
ConcurrentRenderer::ConcurrentRenderer():
m_Event("ConcurrentRenderer")
@@ -405,7 +404,7 @@ void ConcurrentRenderer::Stop()
void ConcurrentRenderer::RenderThread()
{
ASSERT( SCREENMAN != NULL );
ASSERT( SCREENMAN != nullptr );
while( !m_bShutdown )
{
@@ -462,7 +461,7 @@ int ConcurrentRenderer::StartRenderThread( void *p )
void GameLoop::StartConcurrentRendering()
{
if( g_pConcurrentRenderer == NULL )
if( g_pConcurrentRenderer == nullptr )
g_pConcurrentRenderer = new ConcurrentRenderer;
g_pConcurrentRenderer->Start();
}