From b4e98dc7fc59d24877efcaefb7f1d8b7d4ffa412 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 9 Mar 2016 12:41:39 +0100 Subject: [PATCH] Formats: Change skip string format Former-commit-id: 75952d298efb69bd9b77df31ee8dc1548442d071 --- src/Nazara/Graphics/Formats/MeshLoader.cpp | 4 ++-- src/Nazara/Graphics/Formats/OBJLoader.cpp | 2 +- src/Nazara/Graphics/Formats/TextureLoader.cpp | 2 +- src/Nazara/Utility/Formats/DDSLoader.cpp | 2 +- src/Nazara/Utility/Formats/FreeTypeLoader.cpp | 2 +- src/Nazara/Utility/Formats/MD2Loader.cpp | 2 +- src/Nazara/Utility/Formats/MD5AnimLoader.cpp | 2 +- src/Nazara/Utility/Formats/MD5MeshLoader.cpp | 2 +- src/Nazara/Utility/Formats/PCXLoader.cpp | 2 +- src/Nazara/Utility/Formats/STBLoader.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Nazara/Graphics/Formats/MeshLoader.cpp b/src/Nazara/Graphics/Formats/MeshLoader.cpp index af6280ef6..b915c6f2e 100644 --- a/src/Nazara/Graphics/Formats/MeshLoader.cpp +++ b/src/Nazara/Graphics/Formats/MeshLoader.cpp @@ -19,7 +19,7 @@ namespace Nz NazaraUnused(stream); bool skip; - if (parameters.custom.GetBooleanParameter("NativeStaticMeshLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeMeshLoader", &skip) && skip) return Ternary_False; return Ternary_Unknown; @@ -71,7 +71,7 @@ namespace Nz NazaraUnused(stream); bool skip; - if (parameters.custom.GetBooleanParameter("NativeAnimatedMeshLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeAnimatedMeshLoader", &skip) && skip) return Ternary_False; return Ternary_Unknown; diff --git a/src/Nazara/Graphics/Formats/OBJLoader.cpp b/src/Nazara/Graphics/Formats/OBJLoader.cpp index a85a734d0..09ad743d7 100644 --- a/src/Nazara/Graphics/Formats/OBJLoader.cpp +++ b/src/Nazara/Graphics/Formats/OBJLoader.cpp @@ -35,7 +35,7 @@ namespace Nz NazaraUnused(stream); bool skip; - if (parameters.custom.GetBooleanParameter("NativeOBJLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeOBJLoader", &skip) && skip) return Ternary_False; return Ternary_Unknown; diff --git a/src/Nazara/Graphics/Formats/TextureLoader.cpp b/src/Nazara/Graphics/Formats/TextureLoader.cpp index 9c1de9182..7530726fb 100644 --- a/src/Nazara/Graphics/Formats/TextureLoader.cpp +++ b/src/Nazara/Graphics/Formats/TextureLoader.cpp @@ -17,7 +17,7 @@ namespace Nz NazaraUnused(stream); bool skip; - if (parameters.custom.GetBooleanParameter("NativeTextureLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeTextureLoader", &skip) && skip) return Ternary_False; return Ternary_Unknown; diff --git a/src/Nazara/Utility/Formats/DDSLoader.cpp b/src/Nazara/Utility/Formats/DDSLoader.cpp index f60e13cb9..8f08abcf2 100644 --- a/src/Nazara/Utility/Formats/DDSLoader.cpp +++ b/src/Nazara/Utility/Formats/DDSLoader.cpp @@ -23,7 +23,7 @@ namespace Nz Ternary Check(Stream& stream, const ImageParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeDDSLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeDDSLoader", &skip) && skip) return Ternary_False; UInt32 magic; diff --git a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp index 4fcc66c9c..aed76d608 100644 --- a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp +++ b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp @@ -349,7 +349,7 @@ namespace Nz Ternary Check(Stream& stream, const FontParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeFreeTypeLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeFreeTypeLoader", &skip) && skip) return Ternary_False; FreeTypeStream face; diff --git a/src/Nazara/Utility/Formats/MD2Loader.cpp b/src/Nazara/Utility/Formats/MD2Loader.cpp index ee37e51c8..856a73823 100644 --- a/src/Nazara/Utility/Formats/MD2Loader.cpp +++ b/src/Nazara/Utility/Formats/MD2Loader.cpp @@ -29,7 +29,7 @@ namespace Nz Ternary Check(Stream& stream, const MeshParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeMD2Loader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeMD2Loader", &skip) && skip) return Ternary_False; UInt32 magic[2]; diff --git a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp index 3a03a5be5..d079dc426 100644 --- a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp +++ b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp @@ -18,7 +18,7 @@ namespace Nz Ternary Check(Stream& stream, const AnimationParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeMD5AnimLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeMD5AnimLoader", &skip) && skip) return Ternary_False; MD5AnimParser parser(stream); diff --git a/src/Nazara/Utility/Formats/MD5MeshLoader.cpp b/src/Nazara/Utility/Formats/MD5MeshLoader.cpp index c17cd9176..4c4b61bae 100644 --- a/src/Nazara/Utility/Formats/MD5MeshLoader.cpp +++ b/src/Nazara/Utility/Formats/MD5MeshLoader.cpp @@ -23,7 +23,7 @@ namespace Nz Ternary Check(Stream& stream, const MeshParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeMD5MeshLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeMD5MeshLoader", &skip) && skip) return Ternary_False; MD5MeshParser parser(stream); diff --git a/src/Nazara/Utility/Formats/PCXLoader.cpp b/src/Nazara/Utility/Formats/PCXLoader.cpp index cfc487e49..1dc7622bd 100644 --- a/src/Nazara/Utility/Formats/PCXLoader.cpp +++ b/src/Nazara/Utility/Formats/PCXLoader.cpp @@ -48,7 +48,7 @@ namespace Nz Ternary Check(Stream& stream, const ImageParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativePCXLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativePCXLoader", &skip) && skip) return Ternary_False; UInt8 manufacturer; diff --git a/src/Nazara/Utility/Formats/STBLoader.cpp b/src/Nazara/Utility/Formats/STBLoader.cpp index 183416045..3ca5b3708 100644 --- a/src/Nazara/Utility/Formats/STBLoader.cpp +++ b/src/Nazara/Utility/Formats/STBLoader.cpp @@ -46,7 +46,7 @@ namespace Nz Ternary Check(Stream& stream, const ImageParams& parameters) { bool skip; - if (parameters.custom.GetBooleanParameter("NativeSTBLoader_Skip", &skip) && skip) + if (parameters.custom.GetBooleanParameter("SkipNativeSTBLoader", &skip) && skip) return Ternary_False; int width, height, bpp;