Patch up to get server to load

This commit is contained in:
Antz 2021-06-10 23:57:43 +01:00
parent fbfad6b848
commit b4eff73c65
No known key found for this signature in database
GPG key ID: 0DF907270598C85F
3 changed files with 20 additions and 53 deletions

View file

@ -954,50 +954,17 @@ void LoadDBCStores(const std::string& dataPath)
exit(1); exit(1);
} }
// Check loaded DBC files proper version //// Check loaded DBC files proper version
std::string failedModules = ""; //if (!sAreaStore.LookupEntry(6863) || // last area (areaflag) added in 5.4.8 (18414)
bool startupFailed=false; // !sCharTitlesStore.LookupEntry(389) || // last char title added in 5.4.8 (18414)
// !sGemPropertiesStore.LookupEntry(2467) || // last gem property added in 5.4.8 (18414)
// last area (areaflag) added in 5.4.8 (18414) // !sMapStore.LookupEntry(1173) || // last map added in 5.4.8 (18414)
if (!sAreaStore.LookupEntry(5401)) // !sSpellStore.LookupEntry(163227) ) // last added spell in 5.4.8 (18414)
{ //{
startupFailed=true; // sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s", AcceptableClientBuildsListStr().c_str());
failedModules += "AreaTable.dbc"; // Log::WaitBeforeContinueIfNeed();
} // exit(1);
//}
// last char title added in 5.4.8 (18414)
if (!sCharTitlesStore.LookupEntry(351))
{
startupFailed=true;
failedModules += ",CharTitles.dbc";
}
// last gem property added in 5.4.8 (18414)
if (!sGemPropertiesStore.LookupEntry(2450))
{
startupFailed=true;
failedModules += ",GemProperties.dbc";
}
// last map added in 5.4.8 (18414)
if (!sMapStore.LookupEntry(1173))
{
startupFailed=true;
failedModules += ",Map.dbc";
}
// last added spell in 5.4.8 (18414)
if (!sSpellStore.LookupEntry(163227))
{
startupFailed=true;
failedModules += ",SpellStore.dbc";
}
if(startupFailed)
{
sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s", AcceptableClientBuildsListStr().c_str());
// TODO: Need to fix this:
// sLog.outError("\nThe Following modules failed the checksum: %s", failedModules);
Log::WaitBeforeContinueIfNeed();
exit(1);
}
sLog.outString(); sLog.outString();
sLog.outString(">> Initialized %d data stores", DBCFilesCount); sLog.outString(">> Initialized %d data stores", DBCFilesCount);

View file

@ -281,4 +281,4 @@ void LoadDBCStores(const std::string& dataPath);
DBCStorage <EmotesEntry> const* GetEmotesStore(); DBCStorage <EmotesEntry> const* GetEmotesStore();
DBCStorage <EmotesTextEntry> const* GetEmotesTextStore(); DBCStorage <EmotesTextEntry> const* GetEmotesTextStore();
#endif #endif

View file

@ -24,20 +24,20 @@
#ifndef MANGOS_H_REVISION #ifndef MANGOS_H_REVISION
#define MANGOS_H_REVISION #define MANGOS_H_REVISION
#define REVISION_NR "2111001" #define REVISION_NR "2114001"
#define REALMD_DB_VERSION_NR 21 #define REALMD_DB_VERSION_NR 22
#define REALMD_DB_STRUCTURE_NR 2 #define REALMD_DB_STRUCTURE_NR 01
#define REALMD_DB_CONTENT_NR 001 #define REALMD_DB_CONTENT_NR 001
#define REALMD_DB_UPDATE_DESCRIPTION "Add_Field_Comments" #define REALMD_DB_UPDATE_DESCRIPTION "Release 22"
#define CHAR_DB_VERSION_NR 21 #define CHAR_DB_VERSION_NR 21
#define CHAR_DB_STRUCTURE_NR 4 #define CHAR_DB_STRUCTURE_NR 5
#define CHAR_DB_CONTENT_NR 001 #define CHAR_DB_CONTENT_NR 001
#define CHAR_DB_UPDATE_DESCRIPTION "Add_Field_Comments" #define CHAR_DB_UPDATE_DESCRIPTION "Update deprecated ROW_FORMAT"
#define WORLD_DB_VERSION_NR 21 #define WORLD_DB_VERSION_NR 21
#define WORLD_DB_STRUCTURE_NR 13 #define WORLD_DB_STRUCTURE_NR 14
#define WORLD_DB_CONTENT_NR 001 #define WORLD_DB_CONTENT_NR 001
#define WORLD_DB_UPDATE_DESCRIPTION "GM_Commands_localization" #define WORLD_DB_UPDATE_DESCRIPTION "Update deprecated ROW_FORMAT"
#endif // __REVISION_H__ #endif // __REVISION_H__