Utility: Fix Cursor missing initialization
This commit is contained in:
@@ -18,6 +18,7 @@ namespace Nz
|
|||||||
|
|
||||||
class NAZARA_UTILITY_API Cursor
|
class NAZARA_UTILITY_API Cursor
|
||||||
{
|
{
|
||||||
|
friend class Utility;
|
||||||
friend class WindowImpl;
|
friend class WindowImpl;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include <Nazara/Utility/Animation.hpp>
|
#include <Nazara/Utility/Animation.hpp>
|
||||||
#include <Nazara/Utility/Buffer.hpp>
|
#include <Nazara/Utility/Buffer.hpp>
|
||||||
#include <Nazara/Utility/Config.hpp>
|
#include <Nazara/Utility/Config.hpp>
|
||||||
|
#include <Nazara/Utility/Cursor.hpp>
|
||||||
#include <Nazara/Utility/Font.hpp>
|
#include <Nazara/Utility/Font.hpp>
|
||||||
#include <Nazara/Utility/Image.hpp>
|
#include <Nazara/Utility/Image.hpp>
|
||||||
#include <Nazara/Utility/Mesh.hpp>
|
#include <Nazara/Utility/Mesh.hpp>
|
||||||
@@ -110,6 +111,13 @@ namespace Nz
|
|||||||
NazaraError("Failed to initialize window's system");
|
NazaraError("Failed to initialize window's system");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Must be initialized after Window
|
||||||
|
if (!Cursor::Initialize())
|
||||||
|
{
|
||||||
|
NazaraError("Failed to initialize cursors");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// On enregistre les loaders pour les extensions
|
// On enregistre les loaders pour les extensions
|
||||||
@@ -180,7 +188,9 @@ namespace Nz
|
|||||||
Loaders::UnregisterSTBLoader();
|
Loaders::UnregisterSTBLoader();
|
||||||
Loaders::UnregisterSTBSaver();
|
Loaders::UnregisterSTBSaver();
|
||||||
|
|
||||||
|
Cursor::Uninitialize(); //< Must be done before Window
|
||||||
Window::Uninitialize();
|
Window::Uninitialize();
|
||||||
|
|
||||||
VertexDeclaration::Uninitialize();
|
VertexDeclaration::Uninitialize();
|
||||||
Skeleton::Uninitialize();
|
Skeleton::Uninitialize();
|
||||||
PixelFormat::Uninitialize();
|
PixelFormat::Uninitialize();
|
||||||
|
|||||||
Reference in New Issue
Block a user