X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FPerson.cpp;h=8022c0fc3323f023bc485bb3ff2eb20a7ae12ad9;hp=d0e8f083742ffd22baf8a5b7b864382d29f0af66;hb=29b23632dbddbb74ca9c74e3229c5e4729fe3622;hpb=d320bd1b418c85ec4b1edf967b50426f0f553322 diff --git a/Source/Objects/Person.cpp b/Source/Objects/Person.cpp index d0e8f08..8022c0f 100644 --- a/Source/Objects/Person.cpp +++ b/Source/Objects/Person.cpp @@ -169,6 +169,7 @@ Person::Person() victim(nullptr) , hasvictim(false) + , isplayerfriend(false) , updatedelay(0) @@ -7324,7 +7325,7 @@ bool Person::addClothes(const int& clothesId) void Person::doAI() { - if (!isPlayerControlled() && !Dialog::inDialog()) { + if (!isPlayerControlled() && !isPlayerFriend() && !Dialog::inDialog()) { jumpclimb = 0; //disable movement in editor if (Game::editorenabled) {