aboutsummaryrefslogtreecommitdiff
path: root/src/shared/Common.h
diff options
context:
space:
mode:
authormaximius <none@none>2009-10-17 15:35:07 -0700
committermaximius <none@none>2009-10-17 15:35:07 -0700
commit26b5e033ffde3d161382fc9addbfa99738379641 (patch)
treea344f369ca32945f787a02dee35c3dbe342bed7e /src/shared/Common.h
parentf21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff)
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
Diffstat (limited to 'src/shared/Common.h')
-rw-r--r--src/shared/Common.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/shared/Common.h b/src/shared/Common.h
index 8c948fb1d6d..bfe243b34ab 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -17,10 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef TRINITYCORE_COMMON_H
#define TRINITYCORE_COMMON_H
-
// config.h needs to be included 1st
// TODO this thingy looks like hack ,but its not, need to
// make separate header however, because It makes mess here.
@@ -58,9 +56,7 @@
#undef PACKAGE_VERSION
#undef VERSION
#endif //HAVE_CONFIG_H
-
#include "Platform/Define.h"
-
#if COMPILER == COMPILER_MICROSOFT
# pragma warning(disable:4996) // 'function': was declared deprecated
#ifndef __SHOW_STUPID_WARNINGS__
@@ -75,7 +71,6 @@
# pragma warning(disable:4522) //warning when class has 2 constructors
#endif // __SHOW_STUPID_WARNINGS__
#endif // __GNUC__
-
#include "Utilities/UnorderedMap.h"
#include <stdio.h>
#include <stdlib.h>
@@ -85,13 +80,11 @@
#include <errno.h>
#include <signal.h>
#include <assert.h>
-
#if PLATFORM == PLATFORM_WINDOWS
#define STRCASECMP stricmp
#else
#define STRCASECMP strcasecmp
#endif
-
#include <set>
#include <list>
#include <string>
@@ -99,16 +92,13 @@
#include <queue>
#include <sstream>
#include <algorithm>
-
#include "LockedQueue.h"
#include "Threading.h"
-
#include <ace/Basic_Types.h>
#include <ace/Guard_T.h>
#include <ace/RW_Thread_Mutex.h>
#include <ace/Thread_Mutex.h>
-
#if PLATFORM == PLATFORM_WINDOWS
# define FD_SETSIZE 4096
# include <ace/config-all.h>
@@ -125,11 +115,8 @@
# include <unistd.h>
# include <netdb.h>
#endif
-
#if COMPILER == COMPILER_MICROSOFT
-
#include <float.h>
-
#define I32FMT "%08I32X"
#define I64FMT "%016I64X"
#define snprintf _snprintf
@@ -137,30 +124,20 @@
#define vsnprintf _vsnprintf
#define strdup _strdup
#define finite(X) _finite(X)
-
#else
-
#define stricmp strcasecmp
#define strnicmp strncasecmp
#define I32FMT "%08X"
#define I64FMT "%016llX"
-
#endif
-
#define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER
#define UI64LIT(N) ACE_UINT64_LITERAL(N)
-
#define SI64FMTD ACE_INT64_FORMAT_SPECIFIER
#define SI64LIT(N) ACE_INT64_LITERAL(N)
-
#define SIZEFMTD ACE_SIZE_T_FORMAT_SPECIFIER
-
inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
-
#define atol(a) strtoul( a, NULL, 10)
-
#define STRINGIZE(a) #a
-
enum TimeConstants
{
MINUTE = 60,
@@ -170,7 +147,6 @@ enum TimeConstants
YEAR = MONTH*12,
IN_MILISECONDS = 1000
};
-
enum AccountTypes
{
SEC_PLAYER = 0,
@@ -179,7 +155,6 @@ enum AccountTypes
SEC_ADMINISTRATOR = 3,
SEC_CONSOLE = 4 // must be always last in list, accounts must have less security level always also
};
-
enum LocaleConstant
{
LOCALE_enUS = 0,
@@ -192,25 +167,18 @@ enum LocaleConstant
LOCALE_esMX = 7,
LOCALE_ruRU = 8
};
-
#define MAX_LOCALE 9
-
extern char const* localeNames[MAX_LOCALE];
-
LocaleConstant GetLocaleByName(const std::string& name);
-
// we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some other platforms)
#ifdef max
#undef max
#endif
-
#ifdef min
#undef min
#endif
-
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-
#endif