minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-28 06:20:21 +02:00
Code Issues Projects Releases Wiki Activity

Reduce needless use of wchar / stringw

Browse Source
This commit is contained in:
sfan5
2024-02-18 16:29:03 +01:00
parent 2894d9ab03
commit 19819bd23a
16 changed files with 34 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/Irrlicht/OpenGL/Driver.cpp
View File

@ -290,9 +290,9 @@ COpenGL3DriverBase::~COpenGL3DriverBase()
io::IReadFile* vsFile = FileSystem->createAndOpenFile(vsPath);
if ( !vsFile )
{
core::stringw warning(L"Warning: Missing shader files needed to simulate fixed function materials:\n");
warning += core::stringw(vsPath) + L"\n";
warning += L"Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
std::string warning("Warning: Missing shader files needed to simulate fixed function materials:\n");
warning.append(vsPath.c_str()).append("\n");
warning += "Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
os::Printer::log(warning.c_str(), ELL_WARNING);
return;
}
@ -300,9 +300,9 @@ COpenGL3DriverBase::~COpenGL3DriverBase()
io::IReadFile* fsFile = FileSystem->createAndOpenFile(fsPath);
if ( !fsFile )
{
core::stringw warning(L"Warning: Missing shader files needed to simulate fixed function materials:\n");
warning += core::stringw(fsPath) + L"\n";
warning += L"Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
std::string warning("Warning: Missing shader files needed to simulate fixed function materials:\n");
warning.append(fsPath.c_str()).append("\n");
warning += "Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
os::Printer::log(warning.c_str(), ELL_WARNING);
return;
}
@ -1619,7 +1619,7 @@ COpenGL3DriverBase::~COpenGL3DriverBase()
//! \return Returns the name of the video driver.
const wchar_t* COpenGL3DriverBase::getName() const
const char* COpenGL3DriverBase::getName() const
{
return Name.c_str();
}

4
source/Irrlicht/OpenGL/Driver.h
View File

@ -136,7 +136,7 @@ namespace video
// virtual void drawPixel(u32 x, u32 y, const SColor & color);
//! Returns the name of the video driver.
const wchar_t* getName() const override;
const char* getName() const override;
//! Returns the maximum texture size supported.
core::dimension2du getMaxTextureSize() const override;
@ -345,7 +345,7 @@ namespace video
void endDraw(const VertexType &vertexType);
COpenGL3CacheHandler* CacheHandler;
core::stringw Name;
core::stringc Name;
core::stringc VendorName;
SIrrlichtCreationParameters Params;
OpenGLVersion Version;