Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #13 from chilvence/fixesonly

One pst and one general fix from chiv
  • Loading branch information...
commit 67651b64d93a3e6080671cf7f29d0b1f95455db0 2 parents f8583b7 + 44cd538
@lynxlynxlynx lynxlynxlynx authored
View
2  gemrb/core/GameScript/Actions.cpp
@@ -2593,6 +2593,8 @@ void GameScript::ToggleDoor(Scriptable* Sender, Action* /*parameters*/)
actor->SetOrientation( GetOrient( *otherp, actor->Pos ), false);
if (!door->TryUnlock(actor)) {
displaymsg->DisplayConstantString(STR_DOORLOCKED, DMC_LIGHTGREY, door);
+ door->AddTrigger(TriggerEntry(trigger_failedtoopen, actor->GetGlobalID()));
+
//playsound unsuccessful opening of door
if(door->IsOpen())
core->PlaySound(DS_CLOSE_FAIL);
View
6 gemrb/unhardcoded/pst/item_use.2da
@@ -15,6 +15,12 @@ VHAILOR VHAILOR 59148 7
CIRCLEZ DAKKON 59149 2
KARACH DAKKON 59149 7
KARACH2 DAKKON 59149 7
+BKARACH DAKKON 59149 7
+BKARACH2 DAKKON 59149 7
+BKARACH3 DAKKON 59149 7
+NKARACH DAKKON 59149 7
+NKARACH2 DAKKON 59149 7
+NKARACH3 DAKKON 59149 7
GDIARY GRACE 59150 1
GDIARY GRACE 59151 1
GDIARY GRACE 59152 1
Please sign in to comment.
Something went wrong with that request. Please try again.