Skip to content

Commit

Permalink
Actions: pass the baseclass to ApplyKit in falling-class related actions
Browse files Browse the repository at this point in the history
  • Loading branch information
lynxlynxlynx committed Jul 2, 2016
1 parent 4e6d87b commit 60a7b78
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions gemrb/core/GameScript/Actions.cpp
Expand Up @@ -3944,7 +3944,7 @@ void GameScript::RemovePaladinHood(Scriptable* Sender, Action* /*parameters*/)
return;
}
Actor *act = (Actor *) Sender;
act->ApplyKit(true);
act->ApplyKit(true, act->GetClassID(ISPALADIN));
act->SetMCFlag(MC_FALLEN_PALADIN, OP_OR);
if (act->InParty) displaymsg->DisplayConstantStringName(STR_PALADIN_FALL, DMC_BG2XPGREEN, act);
}
Expand All @@ -3955,7 +3955,7 @@ void GameScript::RemoveRangerHood(Scriptable* Sender, Action* /*parameters*/)
return;
}
Actor *act = (Actor *) Sender;
act->ApplyKit(true);
act->ApplyKit(true, act->GetClassID(ISRANGER));
act->SetMCFlag(MC_FALLEN_RANGER, OP_OR);
if (act->InParty) displaymsg->DisplayConstantStringName(STR_RANGER_FALL, DMC_BG2XPGREEN, act);
}
Expand All @@ -3967,7 +3967,7 @@ void GameScript::RegainPaladinHood(Scriptable* Sender, Action* /*parameters*/)
}
Actor *act = (Actor *) Sender;
act->SetMCFlag(MC_FALLEN_PALADIN, OP_NAND);
act->ApplyKit(false);
act->ApplyKit(false, act->GetClassID(ISPALADIN));
}

void GameScript::RegainRangerHood(Scriptable* Sender, Action* /*parameters*/)
Expand All @@ -3977,7 +3977,7 @@ void GameScript::RegainRangerHood(Scriptable* Sender, Action* /*parameters*/)
}
Actor *act = (Actor *) Sender;
act->SetMCFlag(MC_FALLEN_RANGER, OP_NAND);
act->ApplyKit(false);
act->ApplyKit(false, act->GetClassID(ISRANGER));
}

//transfering item from Sender to target, target must be an actor
Expand Down

0 comments on commit 60a7b78

Please sign in to comment.