From 70397c613108979c36c783f1b7e2a35d7b486851 Mon Sep 17 00:00:00 2001 From: ZXShady <153229951+ZXShady@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:14:03 +0100 Subject: [PATCH] make sfRenderStates_default an extern const variable --- include/CSFML/Graphics/RenderStates.h | 2 +- src/CSFML/Graphics/RenderStates.cpp | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/CSFML/Graphics/RenderStates.h b/include/CSFML/Graphics/RenderStates.h index 18668c8..4bb0ff3 100644 --- a/include/CSFML/Graphics/RenderStates.h +++ b/include/CSFML/Graphics/RenderStates.h @@ -50,4 +50,4 @@ typedef struct /// \brief Define the default values for a RenderState /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfRenderStates sfRenderStates_default(void); +CSFML_GRAPHICS_API const sfRenderStates sfRenderStates_default; diff --git a/src/CSFML/Graphics/RenderStates.cpp b/src/CSFML/Graphics/RenderStates.cpp index af513fa..d84b5c5 100644 --- a/src/CSFML/Graphics/RenderStates.cpp +++ b/src/CSFML/Graphics/RenderStates.cpp @@ -29,13 +29,9 @@ //////////////////////////////////////////////////////////// -sfRenderStates sfRenderStates_default() -{ - sfRenderStates states = { - sfBlendAlpha, - sfTransform_Identity, - nullptr, - nullptr, - }; - return states; -} +const sfRenderStates sfRenderStates_default = { + sfBlendAlpha, + sfTransform_Identity, + nullptr, + nullptr, +};