forked from 0ad/0ad
# remove last occurrences of old ScEd-specific code
This was SVN commit r3719.
This commit is contained in:
parent
bd96a1ab7c
commit
d9944f9524
@ -33,11 +33,9 @@ CFilePacker::CFilePacker(u32 version, const char magicstr[4])
|
|||||||
// Write: write out to file all packed data added so far
|
// Write: write out to file all packed data added so far
|
||||||
void CFilePacker::Write(const char* filename)
|
void CFilePacker::Write(const char* filename)
|
||||||
{
|
{
|
||||||
#ifndef SCED
|
|
||||||
// write out all data (including header)
|
// write out all data (including header)
|
||||||
if(vfs_store(filename, &m_Data[0], m_Data.size(), FILE_NO_AIO) < 0)
|
if(vfs_store(filename, &m_Data[0], m_Data.size(), FILE_NO_AIO) < 0)
|
||||||
throw CFileWriteError();
|
throw CFileWriteError();
|
||||||
#else
|
|
||||||
|
|
||||||
// 'filename' is already an absolute path, so don't use file_make_full_native_path
|
// 'filename' is already an absolute path, so don't use file_make_full_native_path
|
||||||
FILE* fp=fopen(filename,"wb");
|
FILE* fp=fopen(filename,"wb");
|
||||||
@ -53,7 +51,6 @@ void CFilePacker::Write(const char* filename)
|
|||||||
|
|
||||||
// all done
|
// all done
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -75,7 +75,6 @@ static void ATLAS_Run(int argc, char* argv[], int flags = 0)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef SCED // because ScEd's easier to compile with the Atlas code removed
|
|
||||||
// TODO (make nicer)
|
// TODO (make nicer)
|
||||||
extern bool BeginAtlas(int argc, char* argv[], void* dll);
|
extern bool BeginAtlas(int argc, char* argv[], void* dll);
|
||||||
if (!BeginAtlas(argc, argv, atlas_so_handle))
|
if (!BeginAtlas(argc, argv, atlas_so_handle))
|
||||||
@ -83,7 +82,6 @@ static void ATLAS_Run(int argc, char* argv[], int flags = 0)
|
|||||||
debug_warn("Atlas loading failed");
|
debug_warn("Atlas loading failed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1020,14 +1020,12 @@ void Init(int argc, char* argv[], uint flags)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SCED // HACK: ScEd's init order makes this break
|
|
||||||
{
|
{
|
||||||
TIMER("Init_renderblank");
|
TIMER("Init_renderblank");
|
||||||
MICROLOG(L"render blank");
|
MICROLOG(L"render blank");
|
||||||
// render everything to a blank frame to force renderer to load everything
|
// render everything to a blank frame to force renderer to load everything
|
||||||
RenderNoCull();
|
RenderNoCull();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (g_FixedFrameTiming) {
|
if (g_FixedFrameTiming) {
|
||||||
CCamera &g_Camera=*g_Game->GetView()->GetCamera();
|
CCamera &g_Camera=*g_Game->GetView()->GetCamera();
|
||||||
|
@ -694,10 +694,8 @@ void CRenderer::SetFastPlayerColor(bool fast)
|
|||||||
// BeginFrame: signal frame start
|
// BeginFrame: signal frame start
|
||||||
void CRenderer::BeginFrame()
|
void CRenderer::BeginFrame()
|
||||||
{
|
{
|
||||||
#ifndef SCED
|
|
||||||
if(!g_Game || !g_Game->IsGameStarted())
|
if(!g_Game || !g_Game->IsGameStarted())
|
||||||
return;
|
return;
|
||||||
#endif
|
|
||||||
|
|
||||||
// bump frame counter
|
// bump frame counter
|
||||||
m_FrameCounter++;
|
m_FrameCounter++;
|
||||||
@ -928,10 +926,8 @@ void CRenderer::RenderTransparentModels()
|
|||||||
// FlushFrame: force rendering of any batched objects
|
// FlushFrame: force rendering of any batched objects
|
||||||
void CRenderer::FlushFrame()
|
void CRenderer::FlushFrame()
|
||||||
{
|
{
|
||||||
#ifndef SCED
|
|
||||||
if(!g_Game || !g_Game->IsGameStarted())
|
if(!g_Game || !g_Game->IsGameStarted())
|
||||||
return;
|
return;
|
||||||
#endif
|
|
||||||
|
|
||||||
oglCheck();
|
oglCheck();
|
||||||
|
|
||||||
@ -1017,10 +1013,8 @@ void CRenderer::FlushFrame()
|
|||||||
// EndFrame: signal frame end
|
// EndFrame: signal frame end
|
||||||
void CRenderer::EndFrame()
|
void CRenderer::EndFrame()
|
||||||
{
|
{
|
||||||
#ifndef SCED
|
|
||||||
if(!g_Game || !g_Game->IsGameStarted())
|
if(!g_Game || !g_Game->IsGameStarted())
|
||||||
return;
|
return;
|
||||||
#endif
|
|
||||||
|
|
||||||
g_Renderer.SetTexture(0,0);
|
g_Renderer.SetTexture(0,0);
|
||||||
|
|
||||||
|
@ -49,9 +49,7 @@ int CSimulation::Initialize(CGameAttributes* pAttribs)
|
|||||||
|
|
||||||
g_EntityManager.InitializeAll();
|
g_EntityManager.InitializeAll();
|
||||||
|
|
||||||
#ifndef SCED
|
|
||||||
m_pWorld->GetLOSManager()->Initialize(pAttribs->m_LOSSetting);
|
m_pWorld->GetLOSManager()->Initialize(pAttribs->m_LOSSetting);
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user