Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBC: Corrected highest lookup entries for 434 and added cataclysm to GetContentLevelsForMapAndZone

Browse Source
This commit is contained in:
kaelima
2012-08-07 13:21:43 +02:00
parent f110f318f1
commit 5cfb52997e
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Battlegrounds/ArenaTeam.h
View File

@@ -57,7 +57,8 @@ enum ArenaTeamCommandErrors
ERR_ARENA_TEAM_TARGET_TOO_HIGH_S = 0x16,
ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S = 0x17,
ERR_ARENA_TEAM_NOT_FOUND = 0x1B,
ERR_ARENA_TEAMS_LOCKED = 0x1E
ERR_ARENA_TEAMS_LOCKED = 0x1E,
ERR_ARENA_TEAM_TOO_MANY_CREATE = 0x21,
};
enum ArenaTeamEvents

6
src/server/game/DataStores/DB2Stores.cpp
View File

@@ -101,11 +101,11 @@ void LoadDB2Stores(const std::string& dataPath)
}
// Check loaded DB2 files proper version
if (!sItemStore.LookupEntry(72068) || // last item added in 4.2.2 (14545)
!sItemExtendedCostStore.LookupEntry(3652) ) // last item extended cost added in 4.2.2 (14545)
if (!sItemStore.LookupEntry(83086) || // last item added in 4.3.4 (15595)
!sItemExtendedCostStore.LookupEntry(3872) ) // last item extended cost added in 4.3.4 (15595)
{
sLog->outString();
sLog->outError("Please extract correct db2 files from client 4.2.2 14545.");
sLog->outError("Please extract correct db2 files from client 4.3.4 15595.");
exit(1);
}

19
src/server/game/DataStores/DBCStores.cpp
View File

@@ -741,11 +741,11 @@ void LoadDBCStores(const std::string& dataPath)
}
// Check loaded DBC files proper version
if (!sAreaStore.LookupEntry(4559) || // last area (areaflag) added in 4.2.2 (14545)
!sCharTitlesStore.LookupEntry(279) || // last char title added in 4.2.2 (14545)
!sGemPropertiesStore.LookupEntry(1860) || // last gem property added in 4.2.2 (14545)
!sMapStore.LookupEntry(968) || // last map added in 4.2.2 (14545)
!sSpellStore.LookupEntry(102129) ) // last spell added in 4.2.2 (14545)
if (!sAreaStore.LookupEntry(4713) || // last area (areaflag) added in 4.3.4 (15595)
!sCharTitlesStore.LookupEntry(287) || // last char title added in 4.3.4 (15595)
!sGemPropertiesStore.LookupEntry(2250) || // last gem property added in 4.3.4 (15595)
!sMapStore.LookupEntry(980) || // last map added in 4.3.4 (15595)
!sSpellStore.LookupEntry(121820) ) // last spell added in 4.3.4 (15595)
{
sLog->outError("You have _outdated_ DBC files. Please extract correct versions from current using client.");
exit(1);
@@ -874,7 +874,7 @@ uint32 GetAreaFlagByMapId(uint32 mapid)
uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId)
{
if (mapid != 530 && mapid != 571) // speed for most cases
if (mapid != 530 && mapid != 571 && mapid != 732) // speed for most cases
return mapid;
if (WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId))
@@ -893,12 +893,7 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId)
if (!mapEntry)
return CONTENT_1_60;
switch (mapEntry->Expansion())
{
default: return CONTENT_1_60;
case 1: return CONTENT_61_70;
case 2: return CONTENT_71_80;
}
return ContentLevels(mapEntry->Expansion());
}
bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId)

9
src/server/game/DataStores/DBCStores.h
View File

@@ -48,11 +48,12 @@ const std::string* GetRandomCharacterName(uint8 race, uint8 gender);
enum ContentLevels
{
CONTENT_1_60 = 0,
CONTENT_61_70,
CONTENT_71_80,
CONTENT_81_85
CONTENT_1_60 = 0,
CONTENT_61_70 = 1,
CONTENT_71_80 = 2,
CONTENT_81_85 = 3
};
ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId);
bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId);

2
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -1800,6 +1800,8 @@ void WorldSession::HandleRequestHotfix(WorldPacket& recvPacket)
SendItemSparseDb2Reply(entry);
break;
default:
sLog->outError("CMSG_REQUEST_HOTFIX: Received unknown hotfix type: %u", type);
recvPacket.rfinish();
break;
}
}