nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 22:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2023-12-12 20:52:42 +08:00
parent d879fc9258 c3c644285c
commit 7915f79d04
1088 changed files with 35633 additions and 19812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,8 +448,8 @@ void LoadDBCStores(const std::string& dataPath)
for (SkillLineAbilityEntry const* skillLine : sSkillLineAbilityStore)
{
SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->Spell);
if (spellInfo && spellInfo->Attributes & SPELL_ATTR0_PASSIVE)
SpellEntry const* spellEntry = sSpellStore.LookupEntry(skillLine->Spell);
if (spellEntry && spellEntry->Attributes & SPELL_ATTR0_PASSIVE)
{
for (CreatureFamilyEntry const* cFamily : sCreatureFamilyStore)
{
@@ -458,7 +458,7 @@ void LoadDBCStores(const std::string& dataPath)
continue;
}
if (spellInfo->SpellLevel)
if (spellEntry->SpellLevel)
{
continue;
}
@@ -468,7 +468,7 @@ void LoadDBCStores(const std::string& dataPath)
continue;
}
sPetFamilySpellsStore[cFamily->ID].insert(spellInfo->Id);
sPetFamilySpellsStore[cFamily->ID].insert(spellEntry->Id);
}
}
}

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

@@ -37,7 +37,7 @@ WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid
uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId);
enum ContentLevels
enum ContentLevels : uint8
{
CONTENT_1_60 = 0,
CONTENT_61_70,

4
src/server/game/DataStores/M2Stores.cpp
View File

@@ -15,11 +15,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DBCStores.h"
#include "M2Stores.h"
#include "Containers.h"
#include "DBCStores.h"
#include "Log.h"
#include "M2Structure.h"
#include "M2Stores.h"
#include "World.h"
#include <boost/filesystem/path.hpp>
#include <fstream>

2
src/server/game/DataStores/M2Structure.h
View File

@@ -18,8 +18,8 @@
#ifndef ACORE_M2STRUCTURE_H
#define ACORE_M2STRUCTURE_H
#include <G3D/Vector3.h>
#include <G3D/AABox.h>
#include <G3D/Vector3.h>
// Structures for M2 file. Source: https://wowdev.wiki
#pragma pack(push, 1)