sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split error macro into two versions (format vs non-formating) to allow format checking at compile-time

Browse Source
This commit is contained in:
SirLynix
2023-11-02 15:18:03 +01:00
parent 8fb53f467b
commit 4b8a475bbd
133 changed files with 570 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Platform/SDL2/CursorImpl.cpp
View File

@@ -43,7 +43,7 @@ namespace Nz
m_cursorImage = cursor;
if (!m_cursorImage.Convert(PixelFormat::BGRA8))
NazaraError("Failed to convert icon to BGRA8");
NazaraError("failed to convert icon to BGRA8");
m_surface = SDL_CreateRGBSurfaceWithFormatFrom(
m_cursorImage.GetPixels(),
@@ -55,7 +55,7 @@ namespace Nz
);
if (!m_surface)
NazaraError("failed to create SDL Surface for cursor: {0}", std::string(SDL_GetError()));
NazaraErrorFmt("failed to create SDL Surface for cursor: {0}", SDL_GetError());
m_cursor = SDL_CreateColorCursor(m_surface, hotSpot.x, hotSpot.y);
if (!m_cursor)
@@ -63,7 +63,7 @@ namespace Nz
if (m_surface) //< Just in case exceptions were disabled
SDL_FreeSurface(m_surface);
NazaraError("failed to create SDL cursor: {0}", std::string(SDL_GetError()));
NazaraErrorFmt("failed to create SDL cursor: {0}", SDL_GetError());
}
}
@@ -77,7 +77,7 @@ namespace Nz
{
m_cursor = SDL_CreateSystemCursor(s_systemCursorIds[cursor]);
if (!m_cursor)
NazaraError("failed to create SDL cursor: {0}", std::string(SDL_GetError()));
NazaraErrorFmt("failed to create SDL cursor: {0}", SDL_GetError());
}
}

4
src/Nazara/Platform/SDL2/IconImpl.cpp
View File

@@ -16,7 +16,7 @@ namespace Nz
m_iconImage = icon;
if (!m_iconImage.Convert(PixelFormat::BGRA8))
NazaraError("Failed to convert icon to BGRA8");
NazaraError("failed to convert icon to BGRA8");
m_icon = SDL_CreateRGBSurfaceWithFormatFrom(
m_iconImage.GetPixels(),
@@ -28,7 +28,7 @@ namespace Nz
);
if (!m_icon)
NazaraError("failed to create SDL Surface for icon: {0}", std::string(SDL_GetError()));
NazaraErrorFmt("failed to create SDL Surface for icon: {0}", SDL_GetError());
}
IconImpl::~IconImpl()

2
src/Nazara/Platform/SDL2/InputImpl.cpp
View File

@@ -122,7 +122,7 @@ namespace Nz
if (handle)
SDL_WarpMouseInWindow(handle, x, y);
else
NazaraError("Invalid window handle");
NazaraError("invalid window handle");
}
void InputImpl::StartTextInput()

8
src/Nazara/Platform/SDL2/WindowImpl.cpp
View File

@@ -91,7 +91,7 @@ namespace Nz
m_handle = SDL_CreateWindow(title.c_str(), x, y, width, height, winStyle);
if (!m_handle)
{
NazaraError("failed to create window: {0}", Error::GetLastSystemError());
NazaraErrorFmt("failed to create window: {0}", Error::GetLastSystemError());
return false;
}
@@ -133,7 +133,7 @@ namespace Nz
m_handle = SDL_CreateWindowFrom(systemHandle);
if (!m_handle)
{
NazaraError("Invalid handle");
NazaraError("invalid handle");
return false;
}
@@ -213,7 +213,7 @@ namespace Nz
{
#ifndef NAZARA_PLATFORM_WEB
ErrorFlags flags(ErrorMode::ThrowException);
NazaraError("failed to retrieve window manager info: {0}", SDL_GetError());
NazaraErrorFmt("failed to retrieve window manager info: {0}", SDL_GetError());
#endif
}
@@ -556,7 +556,7 @@ namespace Nz
}
catch (...) // Don't let any exceptions go through C calls
{
NazaraError("An unknown error happened");
NazaraError("an unknown error happened");
}
return 0;

36
src/Nazara/Platform/Window.cpp
View File

@@ -60,7 +60,7 @@ namespace Nz
m_impl = std::make_unique<WindowImpl>(this);
if (!m_impl->Create(mode, title, style))
{
NazaraError("Failed to create window implementation");
NazaraError("failed to create window implementation");
return false;
}
@@ -97,7 +97,7 @@ namespace Nz
m_impl = std::make_unique<WindowImpl>(this);
if (!m_impl->Create(handle))
{
NazaraError("Unable to create window implementation");
NazaraError("unable to create window implementation");
m_impl.reset();
return false;
}
@@ -174,7 +174,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return false;
}
#endif
@@ -187,7 +187,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return false;
}
#endif
@@ -200,7 +200,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return false;
}
#endif
@@ -222,7 +222,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -244,7 +244,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -257,7 +257,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -270,7 +270,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -283,7 +283,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -296,7 +296,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -309,7 +309,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -322,7 +322,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -335,7 +335,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -348,7 +348,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -361,7 +361,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -374,7 +374,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif
@@ -429,7 +429,7 @@ namespace Nz
#if NAZARA_PLATFORM_SAFE
if (!m_impl)
{
NazaraError("Window not created");
NazaraError("window not created");
return;
}
#endif