Many fixes made to get the server to run again

Many, many fixes had to be made due to server failing to start up after
last major implementation of cmangos comits.

src/shared/DataStores/DBCFileLoader.h

@@ -201,9 +201,9 @@ class DBCFileLoader
         char* AutoProduceStringsArrayHolders(const char* fmt, char* dataTable);
         char* AutoProduceStrings(const char* fmt, char* dataTable, LocaleConstant loc);
         /**
-         * @brief This works out the total amount of memory required by the types specified within the format string
+         * Calculate and return the total amount of memory required by the types specified within the format string
          *
-         * @param format
+         * @param format the format string passed to it (see DBCfmt.h)
          * @param index_pos
          * @return uint32 the total amount of memory required for all the data types
          */

src/shared/Database/SQLStorageImpl.h

@@ -274,6 +274,7 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
         return;
     }
 
+//    sLog.outErrorDb("Total # of fields in database: %u - total # of expected fields %u", result->GetFieldCount(), store.GetSrcFieldCount());
     if (store.GetSrcFieldCount() != result->GetFieldCount())
     {
         recordCount = 0;
@@ -369,14 +370,16 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
                     break;
                 default:
                     assert(false && "unknown format character");
-                    break;
             }
             ++y;
         }
+
+        // check on the contents of the fields
+//    sLog.outErrorDb("Entry: %u - InhabitType %u - NPC Flags %u - Unit Flags %u", (*result)[0].GetUInt32(), (*result)[18].GetUInt32(), (*result)[21].GetUInt32(), (*result)[22].GetUInt32());
     }
     while (result->NextRow());
 
     delete result;
-}
+} 
 
 #endif

src/shared/revision.h

@@ -37,7 +37,7 @@
     #define CHAR_DB_UPDATE_DESCRIPTION "match_client_limits"
 
     #define WORLD_DB_VERSION_NR 21
-    #define WORLD_DB_STRUCTURE_NR 2
-    #define WORLD_DB_CONTENT_NR 1
+    #define WORLD_DB_STRUCTURE_NR 1
+    #define WORLD_DB_CONTENT_NR 0
     #define WORLD_DB_UPDATE_DESCRIPTION "script_binding populated"
 #endif // __REVISION_H__