Mercurial > mm7
comparison Actor.h @ 1048:d36681a9e4f8
Слияние
author | Ritor1 |
---|---|
date | Thu, 23 May 2013 11:17:01 +0600 |
parents | 3a5c8df8381d |
children | b79139c3b5c8 |
comparison
equal
deleted
inserted
replaced
1047:76ce871b0076 | 1048:d36681a9e4f8 |
---|---|
185 void UpdateAnimation(); | 185 void UpdateAnimation(); |
186 signed int GetActorsRelation(Actor *a2); | 186 signed int GetActorsRelation(Actor *a2); |
187 void SetRandomGoldIfTheresNoItem(); | 187 void SetRandomGoldIfTheresNoItem(); |
188 bool CanAct(); | 188 bool CanAct(); |
189 bool IsNotAlive(); | 189 bool IsNotAlive(); |
190 void InitializeDialogue(int bPlayerSaysHello); | |
191 bool IsPeasant(); | 190 bool IsPeasant(); |
192 | 191 |
193 | 192 |
194 static void _SelectTarget(unsigned int uActorID, int *a2, bool can_target_party); | 193 static void _SelectTarget(unsigned int uActorID, int *a2, bool can_target_party); |
195 static void Pursue3(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *a4); | 194 static void Pursue3(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *a4); |