immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily removed CNullDevice

dev
Tomasz Kapuściński 2021-06-06 16:50:36 +02:00
parent b322ce064b
commit 5e7fb5010f
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -95,8 +95,6 @@ add_library(colobotbase STATIC
graphics/core/framebuffer.h graphics/core/framebuffer.h
graphics/core/light.h graphics/core/light.h
graphics/core/material.h graphics/core/material.h
graphics/core/nulldevice.cpp
graphics/core/nulldevice.h
graphics/core/texture.h graphics/core/texture.h
graphics/core/type.cpp graphics/core/type.cpp
graphics/core/type.h graphics/core/type.h

12
src/app/app.cpp
View File

@ -39,8 +39,6 @@
#include "common/thread/thread.h" #include "common/thread/thread.h"
#include "graphics/core/nulldevice.h"
#include "graphics/opengl/glutil.h" #include "graphics/opengl/glutil.h"
#include "level/robotmain.h" #include "level/robotmain.h"
@ -655,7 +653,7 @@ bool CApplication::Create()
GetLogger()->Info("No joysticks detected\n"); GetLogger()->Info("No joysticks detected\n");
} }
if (!m_headless) //if (!m_headless)
{ {
std::string graphics = "default"; std::string graphics = "default";
std::string value; std::string value;
@ -679,10 +677,10 @@ bool CApplication::Create()
m_device = Gfx::CreateDevice(m_deviceConfig, "opengl"); m_device = Gfx::CreateDevice(m_deviceConfig, "opengl");
} }
} }
else //else
{ //{
m_device = MakeUnique<Gfx::CNullDevice>(); // m_device = MakeUnique<Gfx::CNullDevice>();
} //}
if (! m_device->Create() ) if (! m_device->Create() )
{ {