Merge master

This commit is contained in:
KimLS
2013-06-05 16:58:11 -07:00
15 changed files with 299 additions and 48 deletions
+1 -1
View File
@@ -862,7 +862,7 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
spells[curspell].classes[initiator->GetPP().class_-1] <= max_level && //maximum level
spells[curspell].classes[initiator->GetPP().class_-1] >= min_level && //minimum level
spells[curspell].skill != 52 &&
( !RuleB(Spells, UseCHAScribeHack) || spells[curspell].effectid[EFFECT_COUNT - 1] != 10 )
spells[curspell].effectid[EFFECT_COUNT - 1] != 10
)
{
if (book_slot == -1) //no more book slots