Magic numbers cleanup:

- Replace many magic numbers with constants
- Use enum for vehicle flags/seat flags
- Correct structure for ItemRandomSuffixEntry

--HG--
branch : trunk

2 files changed, 7 insertions, 4 deletions

diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp
index 49a45d67131..6393dfa8ed4 100644
--- a/src/server/shared/Common.cpp
+++ b/src/server/shared/Common.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 
-char const* localeNames[MAX_LOCALE] = {
+char const* localeNames[TOTAL_LOCALES] = {
   "enUS",
   "koKR",
   "frFR",
@@ -34,7 +34,7 @@ char const* localeNames[MAX_LOCALE] = {
 
 LocaleConstant GetLocaleByName(const std::string& name)
 {
-    for (uint32 i = 0; i < MAX_LOCALE; ++i)
+    for (uint32 i = 0; i < TOTAL_LOCALES; ++i)
         if(name==localeNames[i])
             return LocaleConstant(i);
 
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index d08ccaca86b..c6b82d22314 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -178,10 +178,13 @@ enum LocaleConstant
     LOCALE_ruRU = 8
 };
 
-const uint8 MAX_LOCALE = 9;
+const uint8 TOTAL_LOCALES = 9;
 const LocaleConstant DEFAULT_LOCALE = LOCALE_enUS;
 
-extern char const* localeNames[MAX_LOCALE];
+#define MAX_LOCALES 8
+#define MAX_CHARACTER_TUTORIAL_VALUES 8
+
+extern char const* localeNames[TOTAL_LOCALES];
 
 LocaleConstant GetLocaleByName(const std::string& name);