From: Jaka K. <lyn...@us...> - 2011-10-18 18:42:23
|
gemrb: Infinity Engine emulator The branch master has been updated via ffd6e70b186a9c583c3dc4078165e487d70f7b2d (commit) Summary of changes: gemrb/core/Scriptable/Actor.cpp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) from 0ec66d2635a6184407c5fb19128a78c945719909 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=ffd6e70b186a9c583c3dc4078165e487d70f7b2d commit ffd6e70b186a9c583c3dc4078165e487d70f7b2d Author: Jaka Kranjc <lyn...@us...> Date: Tue Oct 18 20:40:00 2011 +0200 pcf_morale: pass the last attacker when panicking diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp index c488a6c..410f047 100644 --- a/gemrb/core/Scriptable/Actor.cpp +++ b/gemrb/core/Scriptable/Actor.cpp @@ -790,8 +790,7 @@ void Actor::ApplyClab(const char *clab, ieDword max, bool remove) void pcf_morale (Actor *actor, ieDword /*oldValue*/, ieDword /*newValue*/) { if ((actor->Modified[IE_MORALE]<=actor->Modified[IE_MORALEBREAK]) && (actor->Modified[IE_MORALEBREAK] != 0) ) { - //TODO: current attacker should be passed instead of NULL - actor->Panic(NULL, core->Roll(1,3,0) ); + actor->Panic(core->GetGame()->GetActorByGlobalID(actor->LastAttacker), core->Roll(1,3,0) ); } //for new colour actor->SetCircleSize(); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |