diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-07-08 10:25:50 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2015-07-08 10:25:50 +0200 |
commit | 776e4411c0ef5934aeb59f7b916a0b215b9ae80f (patch) | |
tree | 448a075a0538c1326e753540d06aa40e57dae836 /src | |
parent | 5ab88b993e8a339c32a6b126350947df5761a47d (diff) |
Core/DataStores: Dropped a silly build 12880 check in db2 loader (it's a cataclysm beta build)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/shared/DataStores/DB2StorageLoader.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/src/server/shared/DataStores/DB2StorageLoader.cpp b/src/server/shared/DataStores/DB2StorageLoader.cpp index 062cc251450..f4a1518a255 100644 --- a/src/server/shared/DataStores/DB2StorageLoader.cpp +++ b/src/server/shared/DataStores/DB2StorageLoader.cpp @@ -124,37 +124,38 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt) EndianConvert(unk1); - if (build > 12880) + if (fread(&minIndex, 4, 1, f) != 1) // MinIndex WDB2 { - if (fread(&minIndex, 4, 1, f) != 1) // MinIndex WDB2 - { - fclose(f); - return false; - } - EndianConvert(minIndex); + fclose(f); + return false; + } - if (fread(&maxIndex, 4, 1, f) != 1) // MaxIndex WDB2 - { - fclose(f); - return false; - } - EndianConvert(maxIndex); + EndianConvert(minIndex); - if (fread(&locale, 4, 1, f) != 1) // Locales - { - fclose(f); - return false; - } - EndianConvert(locale); + if (fread(&maxIndex, 4, 1, f) != 1) // MaxIndex WDB2 + { + fclose(f); + return false; + } - if (fread(&unk5, 4, 1, f) != 1) // Unknown WDB2 - { - fclose(f); - return false; - } - EndianConvert(unk5); + EndianConvert(maxIndex); + + if (fread(&locale, 4, 1, f) != 1) // Locales + { + fclose(f); + return false; } + EndianConvert(locale); + + if (fread(&unk5, 4, 1, f) != 1) // Unknown WDB2 + { + fclose(f); + return false; + } + + EndianConvert(unk5); + if (maxIndex != 0) { int32 diff = maxIndex - minIndex + 1; |