Core/Scripts: multiple changes

- fixed non pch build
- fixed some warnings
- fixed some coverity issues
- some random things here and there

5 files changed, 10 insertions, 10 deletions

diff --git a/src/server/shared/DataStores/DB2StorageLoader.h b/src/server/shared/DataStores/DB2StorageLoader.h
index cc9bfa76b5c..0bd8c8a9403 100644
--- a/src/server/shared/DataStores/DB2StorageLoader.h
+++ b/src/server/shared/DataStores/DB2StorageLoader.h
@@ -20,9 +20,9 @@
 
 #include "Define.h"
 #include "Utilities/ByteConverter.h"
+
 #include <cassert>
 #include <list>
-#include "Common.h"
 
 class DB2FileLoader
 {
diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index c8f42d6d4e7..9204d68754b 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -18,10 +18,9 @@
 #ifndef DB2STORE_H
 #define DB2STORE_H
 
-#include "DB2StorageLoader.h"
 #include "Common.h"
+#include "DB2StorageLoader.h"
 #include "ByteBuffer.h"
-#include <vector>
 
 /// Interface class for common access
 class DB2StorageBase
@@ -127,7 +126,7 @@ public:
     bool Load(char const* fn, uint32 locale)
     {
         DB2FileLoader db2;
-        // Check if load was sucessful, only then continue
+        // Check if load was successful, only then continue
         if (!db2.Load(fn, fmt))
             return false;
 
@@ -142,17 +141,17 @@ public:
         {
             m_stringPoolList.push_back(stringHolders);
 
-            // load strings from dbc data
+            // load strings from db2 data
             m_stringPoolList.push_back(db2.AutoProduceStrings(fmt, (char*)m_dataTable, locale));
         }
 
-        // error in dbc file at loading if NULL
+        // error in db2 file at loading if NULL
         return indexTable.asT != NULL;
     }
 
     bool LoadStringsFrom(char const* fn, uint32 locale)
     {
-        // DBC must be already loaded using Load
+        // DB2 must be already loaded using Load
         if (!indexTable.asT)
             return false;
 
@@ -161,7 +160,7 @@ public:
         if (!db2.Load(fn, fmt))
             return false;
 
-        // load strings from another locale dbc data
+        // load strings from another locale db2 data
         if (DB2FileLoader::GetFormatStringFieldCount(fmt))
             m_stringPoolList.push_back(db2.AutoProduceStrings(fmt, (char*)m_dataTable, locale));
 
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index f05e7800d3b..a4a2a3dd1c1 100644
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -18,6 +18,7 @@
 
 #ifndef DBC_FILE_LOADER_H
 #define DBC_FILE_LOADER_H
+
 #include "Define.h"
 #include "Utilities/ByteConverter.h"
 #include <cassert>
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 055a8691a87..f2907535da2 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -94,7 +94,7 @@ class DBCStorage
         bool Load(char const* fn, SqlDbc* sql)
         {
             DBCFileLoader dbc;
-            // Check if load was sucessful, only then continue
+            // Check if load was successful, only then continue
             if (!dbc.Load(fn, fmt))
                 return false;
 
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index c4049ae6315..acc18c0a066 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -197,7 +197,7 @@ int64 MoneyStringToMoney(const std::string& moneyString)
         if (gCount + sCount + cCount != 1)
             return 0;
 
-        uint64 amount = atol(*itr);
+        uint64 amount = atoull(*itr);
         if (gCount == 1)
             money += amount * 100 * 100;
         else if (sCount == 1)