Permalink
Browse files

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.
  • Loading branch information...
1 parent c5f9086 commit 06f6f839ff30dfbf0b5a30f4773ba59cc99eaedc @lynxlynxlynx lynxlynxlynx committed Apr 5, 2014
Showing with 0 additions and 5 deletions.
  1. +0 −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

0 comments on commit 06f6f83

Please sign in to comment.