Skip to content

Commit cf664c2

Browse files
committed
fix MOBSI dialogs
1 parent d2de812 commit cf664c2

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

game/game/gamescript.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,8 @@ void GameScript::exec(const GameScript::DlgChoise &dlg,Npc& player, Npc& npc) {
776776

777777
Daedalus::GEngineClasses::C_Info& info = *dlg.handle;
778778

779-
player.stopAnim("");
779+
if(&player!=&npc)
780+
player.stopAnim("");
780781
auto pl = *player.handle();
781782

782783
if(info.information==dlg.scriptFn) {

game/world/objects/interactive.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ bool Interactive::isDetachState(const Npc& npc) const {
579579

580580
bool Interactive::canQuitAtLastState() const {
581581
// NOTE: workaround for B_MoveMob.d
582-
const bool isDoor = (schemeName()=="DOOR");
582+
// TODO: check for T_[DOOR]_FRONT_S1_2_STAND anim
583+
const bool isDoor = (schemeName()=="DOOR" || schemeName()=="GATE");
583584
return (vobType==ZenLoad::zCVobData::VT_oCMobDoor && isDoor) ||
584585
(vobType==ZenLoad::zCVobData::VT_oCMobSwitch) ||
585586
reverseState;

0 commit comments

Comments
 (0)