swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-10-11 03:13:28 -04:00
Code Issues Projects Releases Wiki Activity

merge the actual useful, sane appearing changes from DNC. the changes to the crafting system and packet settings may not be so good

Browse Source
This commit is contained in:
CodeCodon
2015-08-02 17:10:04 -05:00
parent 3a13a83ee3
commit 3668521963
16 changed files with 142 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp
-8
View File
@@ -34,7 +34,6 @@ namespace
{
int s_recursionCountDepends = 0;
const int s_recursionCountDependsMax = 7;
const std::string m_Deprecated = "DEPRECATED_SKILLS";
//----------------------------------------------------------------------
@@ -437,11 +436,6 @@ void SkillObject::connectLinks(DataTable &dataTable, const std::string & parentN
{
skillData.nextSkillBoxes.push_back(nextSkill);
}
else
{
if (m_Deprecated.compare(nextSkillName.c_str()) != 0)
WARNING (true, ("Could not find skill %s in DataTable", nextSkillName.c_str()));
}
}
}
@@ -470,8 +464,6 @@ bool SkillObject::load(DataTable & dataTable, const std::string & skillName)
if (skillRow == -1)
{
skillData = SkillData();
if (m_Deprecated.compare(skillName.c_str()) != 0)
WARNING (true, ("SkillObject::load Could not find skill %s in DataTable", skillName.c_str()));
return false;
}