mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
Use std::function in the Loader.
Accepted By: @wraitii Differential Revision: https://code.wildfiregames.com/D4989 This was SVN commit r27740.
This commit is contained in:
@@ -49,7 +49,6 @@
|
||||
#include "ps/Globals.h"
|
||||
#include "ps/Hotkey.h"
|
||||
#include "ps/Loader.h"
|
||||
#include "ps/LoaderThunks.h"
|
||||
#include "ps/Profile.h"
|
||||
#include "ps/Pyrogenesis.h"
|
||||
#include "ps/TouchInput.h"
|
||||
@@ -207,18 +206,19 @@ CMiniMapTexture& CGameView::GetMiniMapTexture()
|
||||
return m->MiniMapTexture;
|
||||
}
|
||||
|
||||
int CGameView::Initialize()
|
||||
{
|
||||
m->CameraController->LoadConfig();
|
||||
return 0;
|
||||
}
|
||||
|
||||
void CGameView::RegisterInit()
|
||||
{
|
||||
// CGameView init
|
||||
RegMemFun(this, &CGameView::Initialize, L"CGameView init", 1);
|
||||
LDR_Register([this](const double)
|
||||
{
|
||||
m->CameraController->LoadConfig();
|
||||
return 0;
|
||||
}, L"CGameView init", 1);
|
||||
|
||||
RegMemFun(g_TexMan.GetSingletonPtr(), &CTerrainTextureManager::LoadTerrainTextures, L"LoadTerrainTextures", 60);
|
||||
LDR_Register([](const double)
|
||||
{
|
||||
return g_TexMan.LoadTerrainTextures();
|
||||
}, L"LoadTerrainTextures", 60);
|
||||
}
|
||||
|
||||
void CGameView::BeginFrame()
|
||||
|
||||
Reference in New Issue
Block a user