gemrb: Infinity Engine emulator
The branch master has been updated
via 5da902ecaea5e667f1206cbbf7efc2a41382edad (commit)
via 1dd897c6fa0e22adb6ed3e2c6da08eab117a83b0 (commit)
Summary of changes:
gemrb/core/Scriptable/Actor.cpp | 4 +---
gemrb/core/Spell.cpp | 5 ++++-
2 files changed, 5 insertions(+), 4 deletions(-)
from 8ad02df9f4b1fc52323e59639e083ab3a893fb51 (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=5da902ecaea5e667f1206cbbf7efc2a41382edad
commit 5da902ecaea5e667f1206cbbf7efc2a41382edad
Author: Jaka Kranjc <lynxlupodian@...>
Date: Sat Oct 15 21:20:57 2011 +0200
only check the pst friendly spell flag in pst
fixes for example Remove Fear being treated as hostile
diff --git a/gemrb/core/Spell.cpp b/gemrb/core/Spell.cpp
index 6381904..e03907f 100644
--- a/gemrb/core/Spell.cpp
+++ b/gemrb/core/Spell.cpp
@@ -31,6 +31,8 @@
#include "ProjectileServer.h"
#include "Scriptable/Actor.h"
+static int pstflags = false;
+
SPLExtHeader::SPLExtHeader(void)
{
features = NULL;
@@ -45,6 +47,7 @@ Spell::Spell(void)
{
ext_headers = NULL;
casting_features = NULL;
+ pstflags = !!core->HasFeature(GF_PST_STATE_FLAGS);
}
Spell::~Spell(void)
@@ -132,7 +135,7 @@ EffectQueue *Spell::GetEffectBlock(Scriptable *self, const Point &pos, int block
} else {
features = ext_headers[block_index].features;
count = ext_headers[block_index].FeatureCount;
- if (!(ext_headers[block_index].Hostile&4)) {
+ if (pstflags && !(ext_headers[block_index].Hostile&4)) {
pst_hostile = true;
}
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=1dd897c6fa0e22adb6ed3e2c6da08eab117a83b0
commit 1dd897c6fa0e22adb6ed3e2c6da08eab117a83b0
Author: Jaka Kranjc <lynxlupodian@...>
Date: Sat Oct 15 21:11:28 2011 +0200
GenerateActionDirect already works with all scriptables
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index c6c7000..869e983 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -2983,8 +2983,6 @@ void Actor::Panic(Scriptable *attacker, int panicmode)
Action *action;
char Tmp[40];
- //FIXME: GenerateActionDirect should work on any scriptable
- //they just need global ID
if (panicmode == PANIC_RUNAWAY && (!attacker || attacker->Type!=ST_ACTOR)) {
panicmode = PANIC_RANDOMWALK;
}
@@ -2992,7 +2990,7 @@ void Actor::Panic(Scriptable *attacker, int panicmode)
switch(panicmode) {
case PANIC_RUNAWAY:
strncpy(Tmp,"RunAwayFromNoInterrupt([-1])", sizeof(Tmp) );
- action = GenerateActionDirect(Tmp, (Actor *) attacker);
+ action = GenerateActionDirect(Tmp, attacker);
break;
case PANIC_RANDOMWALK:
strncpy(Tmp,"RandomWalk()", sizeof(Tmp) );
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|