Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 05, 2014
Jaka Kranjc lynxlynxlynx AREImporter: fixed regression from 833056d and bugs from 31d4d4b
iwd1 also uses IWD2ScriptName, so too much code was run, breaking
avatar removal in particular, making both iwd/how unfinishable

thanks go to merbie for bisecting
c5f9086
Jaka Kranjc lynxlynxlynx reverting 489ade9 and a few further changes
    Map::UpdateScripts: don't run scripts for actors with avatarremoval set

    true for at least bg2 and we'll use it internally in iwd2

the first concrete test case is how's starting dialog's cutscene,
which breaks with this in place, as the actor marks himself *poof*
mid-cutscene. Similar things happen in iwd2, so some other mechanic
for AF_ENABLED needs to be implemented.
06f6f83
5 gemrb/core/Map.cpp
View
@@ -732,11 +732,6 @@ void Map::UpdateScripts()
}
}
- if (actor->GetStat(IE_AVATARREMOVAL)) {
- actor->Stop(); // maze and imprisonment should invalidate existing actions
- continue;
- }
-
/*
* we run scripts all at once because one of the actions in ProcessActions
* might remove us from a cutscene and then bad things can happen when
2  gemrb/plugins/AREImporter/AREImporter.cpp
View
@@ -1038,7 +1038,7 @@ Map* AREImporter::GetMap(const char *ResRef, bool day_or_night)
ab->SetScriptName(DefaultName);
}
//IWD2 specific hacks
- if (core->HasFeature(GF_IWD2_SCRIPTNAME)) {
+ if (core->HasFeature(GF_3ED_RULES)) {
//This flag is used for something else in IWD2
if (Flags&AF_NAME_OVERRIDE) {
ab->BaseStats[IE_EA]=EA_EVILCUTOFF;

No commit comments for this range

Something went wrong with that request. Please try again.