From 3561ab98bae1dc111530223aaf25f58bb3267677 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 6 Jul 2013 20:21:45 +0100 Subject: Misc: Use override and final C++11 keywords in a few places (mostly scripts) OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not support C++11) --- src/server/shared/Define.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/server/shared') diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 682167a96e3..d18f160aeaf 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -70,6 +70,14 @@ # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU +#if COMPILER_HAS_CPP11_SUPPORT +# define OVERRIDE override +# define FINAL final +#else +# define OVERRIDE +# define FINAL +#endif //COMPILER_HAS_CPP11_SUPPORT + #define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER #define UI64LIT(N) ACE_UINT64_LITERAL(N) -- cgit v1.2.3 From 2005be04740406f17bd8af8569f2cd75aa0614d4 Mon Sep 17 00:00:00 2001 From: Warpten Date: Wed, 10 Jul 2013 21:44:08 +0200 Subject: Shared/Utils: Fixed ApplyPercentModFloatVar. This has been around since 2010-12-11 :) --- src/server/shared/Utilities/Util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index a379bfd32fc..fff86b11901 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -114,7 +114,8 @@ inline void ApplyPercentModFloatVar(float& var, float val, bool apply) { if (val == -100.0f) // prevent set var to zero val = -99.99f; - var *= (apply ? (100.0f + val) / 100.0f : 100.0f / (100.0f + val)); + + var *= apply ? (100.0f + val) / 100.0f : (100.0f - val) / 100.0f; } // Percentage calculation -- cgit v1.2.3 From 55338ff53bdc73e5bab02c00ef25b0a2ce354096 Mon Sep 17 00:00:00 2001 From: Warpten Date: Thu, 11 Jul 2013 11:10:05 +0200 Subject: Revert "Shared/Utils: Fixed ApplyPercentModFloatVar." This reverts commit 2005be04740406f17bd8af8569f2cd75aa0614d4. Note to self: do not touch maths past 10 any more. --- src/server/shared/Utilities/Util.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index fff86b11901..a379bfd32fc 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -114,8 +114,7 @@ inline void ApplyPercentModFloatVar(float& var, float val, bool apply) { if (val == -100.0f) // prevent set var to zero val = -99.99f; - - var *= apply ? (100.0f + val) / 100.0f : (100.0f - val) / 100.0f; + var *= (apply ? (100.0f + val) / 100.0f : 100.0f / (100.0f + val)); } // Percentage calculation -- cgit v1.2.3