X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=9e2bc9f4bf7d6cc01604ac4ba46ea205c54cc3b8;hb=e7b76642d8998c250272a8313ad8aa7c7efff319;hp=71c0660c2926d45cb9663818af1911277b374384;hpb=faef1e1f8db1918c832c47109221d905bb81047b;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index 71c0660..9e2bc9f 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -25,6 +25,7 @@ along with Lugaru. If not, see . #include "Sounds.h" #include "Awards.h" #include "Game.h" +#include "Dialog.h" extern float multiplier; extern Terrain terrain; @@ -65,8 +66,6 @@ extern float damagedealt; extern int hostile; extern float hostiletime; -extern int indialogue; - extern bool gamestarted; std::vector> Person::players(1, std::shared_ptr(new Person())); @@ -504,7 +503,7 @@ void Person::CatchFire() */ int Person::getIdle() { - if (indialogue != -1 && howactive == typeactive && creature == rabbittype) + if (Dialog::inDialog() && (howactive == typeactive) && (creature == rabbittype)) return talkidleanim; if (hasvictim && (victim != this->shared_from_this())/*||(id==0&&attackkeydown)*/) if (/*(id==0&&attackkeydown)||*/(!victim->dead && victim->aitype != passivetype &&