Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Aug 07, 2013
@lynxlynxlynx lynxlynxlynx added SetAreaScript alias for ChangeAIScript (bgee) 4d3497c
@lynxlynxlynx lynxlynxlynx added an alias for RunAwayFromNoInterruptNoLeaveArea
this is currently the default behaviour, since don't allow running away
into other areas
edae0ae
View
1  gemrb/core/GameScript/Actions.cpp
@@ -1544,6 +1544,7 @@ void GameScript::RunAwayFromNoInterrupt(Scriptable* Sender, Action* parameters)
}
//actor->InternalFlags|=IF_NOINT;
actor->NoInterrupt();
+ //TODO: actor could use travel areas; once implemented, copy original to RunAwayFromNoInterruptNoLeaveArea and break the alias in GameScript.cpp
// we should be using int0Parameter for the timing here, not distance
if (!actor->InMove()) {
// we should make sure our existing walk is a 'run away', or fix moving/path code
View
2  gemrb/core/GameScript/GameScript.cpp
@@ -788,6 +788,7 @@ static const ActionLink actionnames[] = {
{"revealareaonmap", GameScript::RevealAreaOnMap, 0},
{"runawayfrom", GameScript::RunAwayFrom,AF_BLOCKING|AF_ALIVE},
{"runawayfromnointerrupt", GameScript::RunAwayFromNoInterrupt,AF_BLOCKING|AF_ALIVE},
+ {"runawayfromnointerruptnoleavearea", GameScript::RunAwayFromNoInterrupt,AF_BLOCKING|AF_ALIVE},
{"runawayfromnoleavearea", GameScript::RunAwayFromNoLeaveArea,AF_BLOCKING|AF_ALIVE},
{"runawayfrompoint", GameScript::RunAwayFromPoint,AF_BLOCKING|AF_ALIVE},
{"runfollow", GameScript::RunAwayFrom,AF_BLOCKING|AF_ALIVE},
@@ -808,6 +809,7 @@ static const ActionLink actionnames[] = {
{"setapparentnamestrref", GameScript::SetApparentName, 0},
{"setareaflags", GameScript::SetAreaFlags, 0},
{"setarearestflag", GameScript::SetAreaRestFlag, 0},
+ {"setareascript", GameScript::ChangeAIScript, 0},
{"setbeeninpartyflags", GameScript::SetBeenInPartyFlags, 0},
{"setbestweapon", GameScript::SetBestWeapon, 0},
{"setcorpseenabled", GameScript::AmbientActivate, 0},//another weird name

No commit comments for this range

Something went wrong with that request. Please try again.